Re: devel/p5-Test-CheckManifest: Update to 1.42

2022-07-08 Thread nigel
On 07/07/2022 13:47, wen heping wrote:
> Hi, all:
> 
> Here is a patch to update devel/p5-Test-CheckManifest to 1.42,
> it build well and pass all tests on amd64-current system.
> Three ports depend on it, all build well and pass all tests on 
> amd64-current system.
> 
> 
> Regards,
> wen

Ok with me.



Re: www/p5-HTTP-Cookies : Update to 6.10

2021-05-16 Thread nigel
overwhelmed with other things, and behind on OpenBSD versions so no
testing, is a simple changes from 6.08, which was the last update I made
locally, and tested.

Ok from me



On 16/05/2021 08:40, wen heping wrote:
> Hi,
> 
> Here is a patch for www/p5-HTTP-Cookies to update to 6.10, it
> build well and pass all tests on amd64-6.9 system.
> 
>5 ports depends on it ,all build well and pass all tests on amd64-6.9
> system.
> 
> 
> 
> wen
> 



Re: www/p5-HTTP-Message : Update to 6.31

2021-05-16 Thread nigel
On 16/05/2021 08:02, wen heping wrote:
> Hi,
> 
>     Here is a patch for www/p5-HTTP-Message to update to 6.31,
> it build well and pass all tests on amd64-6.9 system.
> 
>    32 ports depends on it, I have tested some of it , such as:
>    www/p5-Dancer
>    www/p5-Plack
>    www/p5-Catalyst-Runtime
>    www/p5-HTML-Form
>    did not meet any problems, all build well and pass all tests.
> 
> wen
overwhelmed with other things, and behind on OpenBSD versions so no
testing, is a simple changes from 6.24, which was the last update I made
locally, and tested.

Ok from me



Re: lang/gcc fails on -current

2019-07-22 Thread Nigel
On 22/07/2019 14:06, Stuart Henderson wrote:
> On 2019/07/22 13:36, Nigel Taylor wrote:
>> On 22/07/2019 12:21, Stuart Henderson wrote:
>>> On 2019/07/22 08:36, Pavel Korovin wrote:
>>>> On 07/20, Nigel Taylor wrote:
>>>>> I can get past the sinfo.h error, treeprs.ads and osnames errors, but
>>>>> there are more afterwards. Too many errors to fix by hand.
>>>>>
>>>>> The problem I think lies in opening files for writing when they don't
>>>>> exist, it fails to create an empty file. So I manually touch sinfo.h to
>>>>> create the empty file. Same for other missing files.
>>>>>
>>>>> Add env FLAVOR=no_ada to the make or if using dpb lang/gcc/8,no_ada
>>>>>
>>>>>
>>>>> Not sure where the error is could be with the ada bootstrap file, needs
>>>>> regenerating.
>>>>
>>>> The same problem here, please find the diff for gcc8 attached.
>>>
>>> Yet the Makefiles are presumably OK on other systems, and are OK on i386.
>>>
>>> Has anyone figured out what triggered this to start failing and what is
>>> actually going on?
>>>
>>> Wondering if there's an LP64 related problem. The only other 64-bit arch
>>> building ada support in ports/lang/gcc/8 is mips64. Anyone know if that
>>> still works?
>>>
>>> The most obvious candidate to my eyes would be realpath, if there's some
>>> problem with this it could impact many many ports. So I think we should
>>> figure out what's really going on before committing workarounds to gcc
>>> which take the whole thing off the radar.
>>>
>>>
>>
>> This is a ktrace/kdump side by side of grep CALL's one with and one
>> without sinfo.h present.
>>
>>  70692 xsinfo   CALL  write(1,0x444b5f5cc1f,0x1)
>>│
>> 76912 xsinfo   CALL  write(1,0x97722da4c1f,0x1)
>>  70692 xsinfo   CALL  write(1,0x7f7d8580,0x35)
>>│
>> 76912 xsinfo   CALL  write(1,0x7f7a5ce0,0x35)
>>  70692 xsinfo   CALL  __realpath(0x7f7ee630,0x7f7eddf0)
>>│
>> 76912 xsinfo   CALL  __realpath(0x7f7bbd90,0x7f7bb550)
>>  70692 xsinfo   CALL
>> open(0x7f7ee630,0x601,0666)
>>   │ 76912 xsinfo   CALL  kbind(0x7f7bb8a0,24,0x494ab4884a3e974f)
>>  70692 xsinfo   CALL  fstat(4,0x7f7ee150)
>>│
>> 76912 xsinfo   CALL  kbind(0x7f7bb7f0,24,0x494ab4884a3e974f)
>>  70692 xsinfo   CALL  __realpath(0x7f7ee630,0x7f7eddf0)
>>│
>> 76912 xsinfo   CALL  kbind(0x7f7bb7f0,24,0x494ab4884a3e974f)
>>  70692 xsinfo   CALL  open(0x7f7ee630,0)
>>│
>> 76912 xsinfo   CALL
>> mmap(0,0x4000,0x3,0x1002,-1,0)
>>  70692 xsinfo   CALL  fstat(5,0x7f7ee150)
>>│
>> 76912 xsinfo   CALL
>> mmap(0,0x4000,0x3,0x1002,-1,0)
>>
>> Only when the file exists after the __realpath call is open called,
>> suggesting __realpath is returning an error for the missing file,
>> causing the open to be skipped. Could be realpath returning wrong error
>> in this case or runtime looking for the wrong error or not expecting an
>> error.
>>
>> As a quick check I reverted back to a kernel I built 15 July, with that
>> kernel xsinfo works when sinfo.h is missing.
>>
>>
>> Which looks, this change might be the cause of problems. but only
>> guessing. But doesn't seem to tie up with your later email.
>>
>>  cvs -R -q diff -uNp -r 1.321 vfs_syscalls.c
>> Index: vfs_syscalls.c
>> ===
>> RCS file: /home/cvs/src/sys/kern/vfs_syscalls.c,v
>> retrieving revision 1.321
>> retrieving revision 1.323
>> diff -u -p -r1.321 -r1.323
>> --- vfs_syscalls.c  12 Jul 2019 13:56:27 -  1.321
>> +++ vfs_syscalls.c  15 Jul 2019 15:05:21 -  1.323
>> @@ -1,4 +1,4 @@
>> -/* $OpenBSD: vfs_syscalls.c,v 1.321 2019/07/12 13:56:27 solene Exp
>> $   */
>> +/* $OpenBSD: vfs_syscalls.c,v 1.323 2019/07/15 15:05:21 beck Exp $ */
>>  /* $NetBSD: vfs_syscalls.c,v 1.71 1996

Re: lang/gcc fails on -current

2019-07-22 Thread Nigel Taylor
On 22/07/2019 12:21, Stuart Henderson wrote:
> On 2019/07/22 08:36, Pavel Korovin wrote:
>> On 07/20, Nigel Taylor wrote:
>>> I can get past the sinfo.h error, treeprs.ads and osnames errors, but
>>> there are more afterwards. Too many errors to fix by hand.
>>>
>>> The problem I think lies in opening files for writing when they don't
>>> exist, it fails to create an empty file. So I manually touch sinfo.h to
>>> create the empty file. Same for other missing files.
>>>
>>> Add env FLAVOR=no_ada to the make or if using dpb lang/gcc/8,no_ada
>>>
>>>
>>> Not sure where the error is could be with the ada bootstrap file, needs
>>> regenerating.
>>
>> The same problem here, please find the diff for gcc8 attached.
> 
> Yet the Makefiles are presumably OK on other systems, and are OK on i386.
> 
> Has anyone figured out what triggered this to start failing and what is
> actually going on?
> 
> Wondering if there's an LP64 related problem. The only other 64-bit arch
> building ada support in ports/lang/gcc/8 is mips64. Anyone know if that
> still works?
> 
> The most obvious candidate to my eyes would be realpath, if there's some
> problem with this it could impact many many ports. So I think we should
> figure out what's really going on before committing workarounds to gcc
> which take the whole thing off the radar.
> 
> 

This is a ktrace/kdump side by side of grep CALL's one with and one
without sinfo.h present.

 70692 xsinfo   CALL  write(1,0x444b5f5cc1f,0x1)
   │
76912 xsinfo   CALL  write(1,0x97722da4c1f,0x1)
 70692 xsinfo   CALL  write(1,0x7f7d8580,0x35)
   │
76912 xsinfo   CALL  write(1,0x7f7a5ce0,0x35)
 70692 xsinfo   CALL  __realpath(0x7f7ee630,0x7f7eddf0)
   │
76912 xsinfo   CALL  __realpath(0x7f7bbd90,0x7f7bb550)
 70692 xsinfo   CALL
open(0x7f7ee630,0x601,0666)
  │ 76912 xsinfo   CALL  kbind(0x7f7bb8a0,24,0x494ab4884a3e974f)
 70692 xsinfo   CALL  fstat(4,0x7f7ee150)
   │
76912 xsinfo   CALL  kbind(0x7f7bb7f0,24,0x494ab4884a3e974f)
 70692 xsinfo   CALL  __realpath(0x7f7ee630,0x7f7eddf0)
   │
76912 xsinfo   CALL  kbind(0x7f7bb7f0,24,0x494ab4884a3e974f)
 70692 xsinfo   CALL  open(0x7f7ee630,0)
   │
76912 xsinfo   CALL
mmap(0,0x4000,0x3,0x1002,-1,0)
 70692 xsinfo   CALL  fstat(5,0x7f7ee150)
   │
76912 xsinfo   CALL
mmap(0,0x4000,0x3,0x1002,-1,0)

Only when the file exists after the __realpath call is open called,
suggesting __realpath is returning an error for the missing file,
causing the open to be skipped. Could be realpath returning wrong error
in this case or runtime looking for the wrong error or not expecting an
error.

As a quick check I reverted back to a kernel I built 15 July, with that
kernel xsinfo works when sinfo.h is missing.


Which looks, this change might be the cause of problems. but only
guessing. But doesn't seem to tie up with your later email.

 cvs -R -q diff -uNp -r 1.321 vfs_syscalls.c
Index: vfs_syscalls.c
===
RCS file: /home/cvs/src/sys/kern/vfs_syscalls.c,v
retrieving revision 1.321
retrieving revision 1.323
diff -u -p -r1.321 -r1.323
--- vfs_syscalls.c  12 Jul 2019 13:56:27 -  1.321
+++ vfs_syscalls.c  15 Jul 2019 15:05:21 -  1.323
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_syscalls.c,v 1.321 2019/07/12 13:56:27 solene Exp
$   */
+/* $OpenBSD: vfs_syscalls.c,v 1.323 2019/07/15 15:05:21 beck Exp $ */
 /* $NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $
   */

 /*
@@ -928,7 +928,7 @@ sys___realpath(struct proc *p, void *v,
NDINIT(, LOOKUP, FOLLOW | LOCKLEAF | SAVENAME | REALPATH,
UIO_SYSSPACE, pathname, p);
else
-   NDINIT(, CREATE, FOLLOW | LOCKLEAF | LOCKPARENT |
SAVENAME |
+   NDINIT(, LOOKUP, FOLLOW | LOCKLEAF | LOCKPARENT |
SAVENAME |
REALPATH, UIO_SYSSPACE, pathname, p);

nd.ni_cnd.cn_rpbuf = rpbuf;


I'll look at building kernel with this reverted. Not saying the change
isn't right, but may have exposed error checking which is wrong.



Re: lang/gcc fails on -current

2019-07-22 Thread Nigel Taylor
On 22/07/2019 06:36, Pavel Korovin wrote:
> On 07/20, Nigel Taylor wrote:
>> I can get past the sinfo.h error, treeprs.ads and osnames errors, but
>> there are more afterwards. Too many errors to fix by hand.
>>
>> The problem I think lies in opening files for writing when they don't
>> exist, it fails to create an empty file. So I manually touch sinfo.h to
>> create the empty file. Same for other missing files.
>>
>> Add env FLAVOR=no_ada to the make or if using dpb lang/gcc/8,no_ada
>>
>>
>> Not sure where the error is could be with the ada bootstrap file, needs
>> regenerating.
> 
> The same problem here, please find the diff for gcc8 attached.
> 
I've done much the same already, but the resulting gnat package is
broken. The diff gets around the problem of building, but not the fact
the runtime produced is then broken.

That is the ada Create fails to work when the file is missing

sinfo/xsinfo.adb:  Create (Ofile, Out_File, "sinfo.h");

As no other packages use ada, to build the my set of packages, the
no_ada flavor can be used. Building a non working gnat package only
helps others looking into the problem. Not for general release.

While the diff helps and thanks very much, just don't anyone put it into
CVS. Don't use unless you understand the gnat runtime package will still
be broken. The ada runtime/OpenBSD needs fixing for amd64, not the
building of the package. If the runtime needs fixing a new bootstrap
will be required.



Re: lang/gcc fails on -current

2019-07-20 Thread Nigel Taylor
On 18/07/2019 19:10, Mark Patruck wrote:
> Hi,
> 
> lang/gcc always fails with the following error on amd64 -current (~6 hours 
> old)
> 
> 
> Check for missing set procedures in body
>  OK
> 
> All tests completed successfully, no errors detected
> 
> raised ADA.IO_EXCEPTIONS.USE_ERROR : sinfo.h: No such file or directory
> gmake[3]: *** [/tmp/pobj/gcc-8.3.0/gcc-8.3.0/gcc/ada/Make-generated.in:45: 
> ada/s
> info.h] Error 1
> gmake[3]: *** Waiting for unfinished jobs
> 
> raised ADA.IO_EXCEPTIONS.USE_ERROR : treeprs.ads: No such file or directory
> gmake[3]: *** [/tmp/pobj/gcc-8.3.0/gcc-8.3.0/gcc/ada/Make-generated.in:31: 
> ada/treeprs.ads] Error 1
> 
> raised ADA.IO_EXCEPTIONS.USE_ERROR : System.File_IO.Open: reopening shared 
> file
> gmake[3]: *** [/tmp/pobj/gcc-8.3.0/gcc-8.3.0/gcc/ada/Make-generated.in:53: 
> ada/stamp-snames] Error 1
> /bin/sh /tmp/pobj/gcc-8.3.0/gcc-8.3.0/gcc/../move-if-change tmp-optionlist 
> optionlist
> echo timestamp > s-options
> gmake[3]: Leaving directory '/tmp/pobj/gcc-8.3.0/build-amd64/gcc'
> gmake[2]: *** [Makefile:4609: all-stage1-gcc] Error 2
> gmake[2]: Leaving directory '/tmp/pobj/gcc-8.3.0/build-amd64'
> gmake[1]: *** [Makefile:21749: stage1-bubble] Error 2
> gmake[1]: Leaving directory '/tmp/pobj/gcc-8.3.0/build-amd64'
> gmake: *** [Makefile:21886: bootstrap2] Error 2
> *** Error 2 in lang/gcc/8 (/usr/ports/infrastructure/mk/bsd.port.mk:2781 
> '/tmp/pobj/gcc-8.3.0/build-amd64/.build_done')
> *** Error 1 in lang/gcc/8 (/usr/ports/infrastructure/mk/bsd.port.mk:2447 
> 'build')
> ===> Exiting lang/gcc/8,,-libs with an error
> *** Error 1 in /usr/ports (infrastructure/mk/bsd.port.subdir.mk:137 'build')
> --
> 
> Anyone else seeing this?
> 
Yes I see this, as a work around I built no_ada flavor. Just means I've
got no ada, and other things can be built.

I can get past the sinfo.h error, treeprs.ads and osnames errors, but
there are more afterwards. Too many errors to fix by hand.

The problem I think lies in opening files for writing when they don't
exist, it fails to create an empty file. So I manually touch sinfo.h to
create the empty file. Same for other missing files.

Add env FLAVOR=no_ada to the make or if using dpb lang/gcc/8,no_ada


Not sure where the error is could be with the ada bootstrap file, needs
regenerating.



Re: [UPDATE] net/p5-POE-Component-Client-Keepalive 0.25 -> 0.272 (p5-POE* update 9/14)

2019-01-22 Thread Nigel Taylor
Ok, test run fine on amd64 machine, portcheck ok.

Would question the VERSION, but checking upstream they appear to have
switched from 2 digits to 3 digits, and already using EPOCH in the
Makefile which can't be undone.

On 01/22/19 08:54, Charlene Wendling wrote:
> Hi ports!
> 
> Can someone look at this please? 
> 
> Charlène. 
> 
> 
> On Thu, 1 Nov 2018 12:18:12 +0100
> Charlene Wendling wrote:
> 
>> Hi ports!
>>
>> Here is an update for POE::Component::Client::Keepalive. 
>>
>> The changelog is once again truncated [1].
>>
>> What's new in the port: 
>>
>> - It's a simple version bump with new dependencies.
>>
>> Testing: 
>>
>> - 'make test' runs fine. 
>>
>> Comments and feedback are welcome, 
>>
>> Charlène. 
>>
>>
>> [1]
>> https://metacpan.org/changes/distribution/POE-Component-Client-Keepalive
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/p5-POE-Component-Client-Keepalive/Makefile,v
> retrieving revision 1.12
> diff -u -p -u -p -r1.12 Makefile
> --- Makefile  8 Dec 2017 12:31:48 -   1.12
> +++ Makefile  22 Jan 2019 08:47:24 -
> @@ -4,8 +4,7 @@ COMMENT=  manage connections, with keep-a
>  
>  MODULES= cpan
>  PKG_ARCH=*
> -DISTNAME=POE-Component-Client-Keepalive-0.25
> -REVISION=1
> +DISTNAME=POE-Component-Client-Keepalive-0.272
>  EPOCH=   0
>  CATEGORIES=  net
>  FIX_EXTRACT_PERMISSIONS=Yes
> @@ -14,6 +13,10 @@ FIX_EXTRACT_PERMISSIONS=Yes
>  PERMIT_PACKAGE_CDROM=Yes
>  
>  RUN_DEPENDS= devel/p5-POE \
> - net/p5-POE-Component-Client-DNS
> + net/p5-Net-IP-Minimal \
> + net/p5-POE-Component-Resolver
> +
> +# It would require Pod::Coverage::TrustPod that we don't ship
> +TEST_ENV=RELEASE_TESTING=0
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/p5-POE-Component-Client-Keepalive/distinfo,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 distinfo
> --- distinfo  18 Jan 2015 03:14:48 -  1.4
> +++ distinfo  22 Jan 2019 08:47:24 -
> @@ -1,2 +1,2 @@
> -SHA256 (POE-Component-Client-Keepalive-0.25.tar.gz) = 
> L5gqb+Huqr8CRArQdDdyxQiP9B+KJnK9b94Fhn9SUww=
> -SIZE (POE-Component-Client-Keepalive-0.25.tar.gz) = 23794
> +SHA256 (POE-Component-Client-Keepalive-0.272.tar.gz) = 
> jAgZEA+Fn7/goTRUdz7jtvR81+haMXrWLsNVB8s8Nss=
> +SIZE (POE-Component-Client-Keepalive-0.272.tar.gz) = 41860
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/net/p5-POE-Component-Client-Keepalive/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 22 Jul 2007 16:10:18 -  1.1.1.1
> +++ pkg/PLIST 22 Jan 2019 08:47:24 -
> @@ -2,5 +2,5 @@
>  ${P5SITE}/POE/Component/Client/Keepalive.pm
>  ${P5SITE}/POE/Component/Connection/
>  ${P5SITE}/POE/Component/Connection/Keepalive.pm
> -@man man/man3p/POE::Component::Client::Client-Keepalive.3p
> -@man man/man3p/POE::Component::Client::Conn-Keepalive.3p
> +@man man/man3p/POE::Component::Client::Keepalive.3p
> +@man man/man3p/POE::Component::Connection::Keepalive.3p
> 
> 



Re: [UPDATE] www/p5-HTML-Tree 5.06 -> 5.07

2019-01-09 Thread Nigel
Ok,

I see you have joined porting perl ports, so welcome. If you would like
to update CVS with this port go ahead, if not I should still be able to
do this just let me know. I've left it a while to allow for any other
comments.

For me just include ok nigel@ as comment plus any others like sthen@,
naddy@ etc. If was doing this I would put cwen@ as author of changes in
the CVS comment.



On 01/08/19 08:53, Charlene Wendling wrote:
> On Mon, 7 Jan 2019 23:17:05 +
> Nigel Taylor wrote:
> 
>> I had this update from nearly 1yr ago...
>>
>> $ cvs -R -q diff -uNp
>> Index: Makefile
>> ===
>> RCS file: /home/cvs/ports/www/p5-HTML-Tree/Makefile,v
>> retrieving revision 1.28
>> diff -u -p -r1.28 Makefile
>> --- Makefile1 May 2017 19:54:18 -   1.28
>> +++ Makefile11 Feb 2018 22:55:22 -
>> @@ -4,7 +4,7 @@ COMMENT=perl parser that builds an HTML
>>
>>  MODULES=   cpan
>>  PKG_ARCH=  *
>> -DISTNAME = HTML-Tree-5.06
>> +DISTNAME = HTML-Tree-5.07
>>  CATEGORIES=www
>>
>>  # Perl
>> Index: distinfo
>> ===
>> RCS file: /home/cvs/ports/www/p5-HTML-Tree/distinfo,v
>> retrieving revision 1.11
>> diff -u -p -r1.11 distinfo
>> --- distinfo1 May 2017 19:54:18 -   1.11
>> +++ distinfo11 Feb 2018 22:49:21 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (HTML-Tree-5.06.tar.gz) =
>> nDbrGcvfmlkGyFiUjKUcNb11YfUswYxDKBrL5XMnU24=
>> -SIZE (HTML-Tree-5.06.tar.gz) = 150067
>> +SHA256 (HTML-Tree-5.07.tar.gz) =
>> 8DdNuEcxwgS4bB1bkJdf7w0wqGvZ3vkZND5VTjGp278=
>> +SIZE (HTML-Tree-5.07.tar.gz) = 150477
>>
>> The tests passed here on amd64 using the above.
>>
>> You shouldn't add p5-libwww without changing the BUILD/RUN_DEPENDS to
>> only include p5-libwww for runtime, this stops p5-libwww and all it's
>> run time dependencies having to be built first on build machines, it
>> has a lot of dependencies.
>>
>> Additionally it also promotes some bad habits of not including the
>> dependencies starting to rely on p5-HTML-Tree rather than including
>> p5-libwww as a dependency, and also if include p5-libwww alone you
>> don't get https support you need to add p5-LWP-Protocol-https not
>> p5-libwww
>>
>> p5-libwww used to include https support but was split into a number of
>> separate modules.
>>
>> Something being in the ports tree doesn't make it a reason to include
>> if it's only recommended. Your taking away the option from the end
>> user of the ports of deciding if something is actually needed.
> 
> 
> Hi Nigel, 
> 
> I didn't see things this way, you're right. Thanks! 
> 
> Charlène. 
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/p5-HTML-Tree/Makefile,v
> retrieving revision 1.28
> diff -u -p -u -p -r1.28 Makefile
> --- Makefile  1 May 2017 19:54:18 -   1.28
> +++ Makefile  8 Jan 2019 08:41:58 -
> @@ -4,7 +4,7 @@ COMMENT=  perl parser that builds an HTML
>  
>  MODULES= cpan
>  PKG_ARCH=*
> -DISTNAME =   HTML-Tree-5.06
> +DISTNAME =   HTML-Tree-5.07
>  CATEGORIES=  www
>  
>  # Perl
> @@ -17,8 +17,9 @@ BUILD_DEPENDS=  ${RUN_DEPENDS} \
>  
>  CONFIGURE_STYLE =modbuild
>  
> -TEST_DEPENDS=devel/p5-Test-Pod \
> - devel/p5-Test-LeakTrace \
> - devel/p5-Try-Tiny
> +TEST_DEPENDS=devel/p5-Test-LeakTrace \
> + devel/p5-Try-Tiny
> +
> +MAKE_ENV +=  TEST_POD=Yes
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/p5-HTML-Tree/distinfo,v
> retrieving revision 1.11
> diff -u -p -u -p -r1.11 distinfo
> --- distinfo  1 May 2017 19:54:18 -   1.11
> +++ distinfo  8 Jan 2019 08:41:58 -
> @@ -1,2 +1,2 @@
> -SHA256 (HTML-Tree-5.06.tar.gz) = nDbrGcvfmlkGyFiUjKUcNb11YfUswYxDKBrL5XMnU24=
> -SIZE (HTML-Tree-5.06.tar.gz) = 150067
> +SHA256 (HTML-Tree-5.07.tar.gz) = 8DdNuEcxwgS4bB1bkJdf7w0wqGvZ3vkZND5VTjGp278=
> +SIZE (HTML-Tree-5.07.tar.gz) = 150477
> 
> 
> 
> 



Re: [UPDATE] www/p5-HTML-Tree 5.06 -> 5.07

2019-01-07 Thread Nigel Taylor
I had this update from nearly 1yr ago...

$ cvs -R -q diff -uNp
Index: Makefile
===
RCS file: /home/cvs/ports/www/p5-HTML-Tree/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile1 May 2017 19:54:18 -   1.28
+++ Makefile11 Feb 2018 22:55:22 -
@@ -4,7 +4,7 @@ COMMENT=perl parser that builds an HTML

 MODULES=   cpan
 PKG_ARCH=  *
-DISTNAME = HTML-Tree-5.06
+DISTNAME = HTML-Tree-5.07
 CATEGORIES=www

 # Perl
Index: distinfo
===
RCS file: /home/cvs/ports/www/p5-HTML-Tree/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo1 May 2017 19:54:18 -   1.11
+++ distinfo11 Feb 2018 22:49:21 -
@@ -1,2 +1,2 @@
-SHA256 (HTML-Tree-5.06.tar.gz) =
nDbrGcvfmlkGyFiUjKUcNb11YfUswYxDKBrL5XMnU24=
-SIZE (HTML-Tree-5.06.tar.gz) = 150067
+SHA256 (HTML-Tree-5.07.tar.gz) =
8DdNuEcxwgS4bB1bkJdf7w0wqGvZ3vkZND5VTjGp278=
+SIZE (HTML-Tree-5.07.tar.gz) = 150477

The tests passed here on amd64 using the above.

You shouldn't add p5-libwww without changing the BUILD/RUN_DEPENDS to
only include p5-libwww for runtime, this stops p5-libwww and all it's
run time dependencies having to be built first on build machines, it has
a lot of dependencies.

Additionally it also promotes some bad habits of not including the
dependencies starting to rely on p5-HTML-Tree rather than including
p5-libwww as a dependency, and also if include p5-libwww alone you don't
get https support you need to add p5-LWP-Protocol-https not p5-libwww

p5-libwww used to include https support but was split into a number of
separate modules.

Something being in the ports tree doesn't make it a reason to include if
it's only recommended. Your taking away the option from the end user of
the ports of deciding if something is actually needed.



On 01/07/19 22:34, Charlene Wendling wrote:
> 
> I'm proposing here an update for HTML::Tree. The only change is a fix
> that allow building with newer Perl versions [1].
> 
> What's new in port: 
> 
> - make use of TEST_POD instead of using TEST_DEPENDS
> - added www/p5-libwww, that was already present in 5.06. It's only a
>   recommended module, but we have it in the tree anyway. Not sure if 
>   we want it, but it allows fetching a HTML document directly from
>   an URL, which is quite handy for such a module ;) 
>   
>   The recommended HTML::Formatter is not in the port tree, it's the
>   successor of of the now "dead" devel/p5-HTML-Format [2]. Sure we'll
>   have to update the whole stack around it sooner or later, but there
>   has been no issue with 5.06 that recommended it already. 
> 
> Testing: 
> 
> - 'make test' passes 
> - There are consumers, i've found no new failures [3], but please note
>   that KDE4's extras haven't been firmly tested. It should go without
>   issues anyway, because the only changes are really in Build.PL and
>   distribution files [4].
> 
> Charlène. 
> 
> [1] https://metacpan.org/source/KENTNL/HTML-Tree-5.07/Changes
> [2]
> https://github.com/nigelm/html-formatter/commit/f72de441df4e2159db255bb147bebdbff3273309
> [3] https://transfer.sh/oMGfA/p5-HTML-Tree.tgz
> [4] https://github.com/kentfredric/HTML-Tree/commits/master
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/p5-HTML-Tree/Makefile,v
> retrieving revision 1.28
> diff -u -p -u -p -r1.28 Makefile
> --- Makefile  1 May 2017 19:54:18 -   1.28
> +++ Makefile  7 Jan 2019 21:24:20 -
> @@ -4,21 +4,23 @@ COMMENT=perl parser that builds an HTML
>  
>  MODULES= cpan
>  PKG_ARCH=*
> -DISTNAME =   HTML-Tree-5.06
> +DISTNAME =   HTML-Tree-5.07
>  CATEGORIES=  www
>  
>  # Perl
>  PERMIT_PACKAGE_CDROM=Yes
>  
>  RUN_DEPENDS= www/p5-HTML-Parser>=3.46 \
> - www/p5-HTML-Tagset>=3.02
> + www/p5-HTML-Tagset>=3.02 \
> + www/p5-libwww
>  BUILD_DEPENDS=   ${RUN_DEPENDS} \
>   devel/p5-Test-Fatal
>  
>  CONFIGURE_STYLE =modbuild
>  
> -TEST_DEPENDS=devel/p5-Test-Pod \
> - devel/p5-Test-LeakTrace \
> - devel/p5-Try-Tiny
> +TEST_DEPENDS=devel/p5-Test-LeakTrace \
> + devel/p5-Try-Tiny
> +
> +MAKE_ENV +=  TEST_POD=Yes
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/p5-HTML-Tree/distinfo,v
> retrieving revision 1.11
> diff -u -p -u -p -r1.11 distinfo
> --- distinfo  1 May 2017 19:54:18 -   1.11
> +++ distinfo  7 Jan 2019 21:24:20 -
> @@ -1,2 +1,2 @@
> -SHA256 (HTML-Tree-5.06.tar.gz) = nDbrGcvfmlkGyFiUjKUcNb11YfUswYxDKBrL5XMnU24=
> -SIZE (HTML-Tree-5.06.tar.gz) = 150067
> +SHA256 (HTML-Tree-5.07.tar.gz) = 8DdNuEcxwgS4bB1bkJdf7w0wqGvZ3vkZND5VTjGp278=
> +SIZE (HTML-Tree-5.07.tar.gz) = 150477
> 
> 



Re: CVS: cvs.openbsd.org: ports

2018-06-05 Thread Nigel Taylor
I had sent issue to sthen@ already. Got past this by

doas -u _pbuild env CFLAGS="-I /usr/local/include" make package

works.


Default is to build with php5.6, but pear-utils builds/runs with php 7.0
so have two versions of PHP present when building if just install build
dependencies for this port - should really only ever be one or the other
PHP version, would need a pear/pear-utils for both php 5.6 and 7.0.
Needs sorting out cleaning up, if going to have both flavors. It should
be possible to build and run with just a single php version and never
require the other.


I've built everything else with LDEP's or RDEP's providing all the
dependencies have been defined just waiting on libreoffice to complete -
I used sqlport to determine what dependencies needed rebuilding, there
are BDEPS only's which may not have been rebuilt (seems unlikely to a
BDEP on php and not a matching RDEP) checked and the only cases found
are where there are -php subpackages the other subpackages -main etc
have no php runtime requirement, I normally build all the subpackages.

So it's looks like just the one port with an issue with the include, and
simple enough to fix.



On 06/05/18 13:32, Antoine Jacoutot wrote:
> On Mon, Jun 04, 2018 at 09:22:37AM -0600, Martijn van Duren wrote:
>> CVSROOT: /cvs
>> Module name: ports
>> Changes by:  mart...@cvs.openbsd.org 2018/06/04 09:22:37
>>
>> Modified files:
>>  lang/php   : Makefile.inc 
>>  lang/php/5.6   : Makefile 
>>  lang/php/5.6/pkg: PLIST-main 
>>  lang/php/7.0   : Makefile 
>>  lang/php/7.0/pkg: PLIST-main 
>>
>> Log message:
>> Make PHP link against devel/pcre instead of embedding a custom out of
>> date version.
>>
>> OK sthen@
> 
> Could this change have broken at least: graphics/pecl-imagick,php70 ?
> 
 Building on exopi-9 under graphics/pecl-imagick,php70
>BDEPENDS = 
> [lang/php/7.0;www/pear;devel/autoconf/2.62;devel/metaauto;devel/automake/1.9;graphics/ImageMagick;devel/gmake;converters/libiconv]
>DIST = [graphics/pecl-imagick,php56:imagick-3.4.3.tgz]
>FULLPKGNAME = pecl70-imagick-3.4.3p1
>RDEPENDS = [lang/php/7.0;converters/libiconv;graphics/ImageMagick]
> (Junk lock obtained for exopi-9 at 1528196433)
 Running depends in graphics/pecl-imagick,php70 at 1528196433
>last junk was in x11/kde/i18n3/ss
> /usr/sbin/pkg_add -aI -Dunsigned -Drepair ImageMagick-6.9.9.47 
> autoconf-2.62p2 automake-1.9.6p12 libiconv-1.14p3 metaauto-1.0p1 
> pear-1.10.1p0 php-7.0.30p7
> was: /usr/sbin/pkg_add -aI -Dunsigned -Drepair ImageMagick-6.9.9.47 
> autoconf-2.62p2 automake-1.9.6p12 gmake-4.2.1 libiconv-1.14p3 metaauto-1.0p1 
> pear-1.10.1p0 php-7.0.30p7
> /usr/sbin/pkg_add -aI -Dunsigned -Drepair ImageMagick-6.9.9.47 
> autoconf-2.62p2 automake-1.9.6p12 libiconv-1.14p3 metaauto-1.0p1 
> pear-1.10.1p0 php-7.0.30p7
> The following new rcscripts were installed: /etc/rc.d/php70_fpm
> See rcctl(8) for details.
> Look in /usr/local/share/doc/pkg-readmes for extra documentation.
 Running show-prepare-results in graphics/pecl-imagick,php70 at 1528196464
> ===> graphics/pecl-imagick,php70
> ===> pecl70-imagick-3.4.3p1 depends on: pear-* -> pear-1.10.1p0
> ===> pecl70-imagick-3.4.3p1 depends on: metaauto-* -> metaauto-1.0p1
> ===> pecl70-imagick-3.4.3p1 depends on: autoconf-2.62 -> autoconf-2.62p2
> ===> pecl70-imagick-3.4.3p1 depends on: automake->=1.9,<1.10 -> 
> automake-1.9.6p12
> ===> pecl70-imagick-3.4.3p1 depends on: php->=7.0,<7.1 -> php-7.0.30p7
> ===> pecl70-imagick-3.4.3p1 depends on: gmake-* -> gmake-4.2.1
> ===> pecl70-imagick-3.4.3p1 depends on: libiconv-* -> libiconv-1.14p3
> ===> pecl70-imagick-3.4.3p1 depends on: ImageMagick-* -> ImageMagick-6.9.9.47
> ===>  Verifying specs:  ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 Xext Xt 
> bz2 c djvulibre expat fftw3 fontconfig freetype iconv jbig jpeg lcms2 lzma m 
> openjp2 png pthread tiff webp xcb xml2 z
> ===>  found ICE.10.0 MagickCore-6.Q16.6.1 MagickWand-6.Q16.4.0 SM.9.0 
> X11.16.1 Xext.13.0 Xt.11.0 bz2.10.4 c.92.3 djvulibre.26.0 expat.12.0 
> fftw3.7.1 fontconfig.12.0 freetype.29.0 iconv.6.0 jbig.3.0 jpeg.68.1 
> lcms2.1.2 lzma.2.1 m.10.1 openjp2.3.1 png.17.5 pthread.25.1 tiff.40.2 
> webp.4.0 xcb.4.0 xml2.16.1 z.5.0
> ImageMagick-6.9.9.47
> autoconf-2.62p2
> automake-1.9.6p12
> gmake-4.2.1
> libiconv-1.14p3
> metaauto-1.0p1
> pear-1.10.1p0
> php-7.0.30p7
> (Junk lock released for exopi-9 at 1528196467)
> Woken up x11/qt5/qtxmlpatterns
> distfiles size=245410
 Running build in graphics/pecl-imagick,php70 at 1528196467
> ===> graphics/pecl-imagick,php70
> ===>  Checking files for pecl70-imagick-3.4.3p1
> `/exopi-cvs/ports/distfiles/imagick-3.4.3.tgz' is up to date.
>>> (SHA256) imagick-3.4.3.tgz: OK
> ===>  Extracting for pecl70-imagick-3.4.3p1
> ===>  Patching for pecl70-imagick-3.4.3p1
> ===>  Compiler link: clang -> /usr/bin/clang
> ===>  Compiler link: clang++ -> /usr/bin/clang++
> ===>  Compiler link: cc -> /usr/bin/cc
> ===>  Compiler link: c++ -> 

CVS: cvs.openbsd.org: ports

2018-05-29 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2018/05/29 16:07:41

Modified files:
misc/gpsd  : Makefile 

Log message:
bump after php switch to 7.0
Ok sthen@



Re: [update] davical & awl [was: www/awl needs update to work with PHP 7, breaks productivity/davical]

2018-05-28 Thread Nigel Taylor
Somewhere along with the various updates, something slightly different
has ended up going into CVS for www/awl and is broken. Fix to bring back
to what I think was intended - GITLAB_PROJECT is no longer defined.

$ cvs -R -q diff -uNp
Index: Makefile
===
RCS file: /home/cvs/ports/www/awl/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile28 May 2018 20:19:41 -  1.12
+++ Makefile29 May 2018 00:12:32 -
@@ -15,8 +15,7 @@ MASTER_SITES =https://www.davical.org/d

 WRKSRC =   ${WRKDIR}
 PREFIX =   ${VARBASE}/www
-WRKDIST =  ${WRKDIR}/${GITLAB_PROJECT}.git
-INSTDIR =  ${PREFIX}/${GITLAB_PROJECT}
+INSTDIR =  ${PREFIX}/awl
 SUBST_VARS =   INSTDIR
 NO_BUILD = Yes
 NO_TEST =  Yes


On 05/28/18 12:54, Stuart Henderson wrote:
> On 2018/05/28 12:26, viq wrote:
>> On Sun, 27 May 2018, 22:17 Landry Breuil,  wrote:
>>
>>> On Sun, May 27, 2018 at 10:01:22PM +0200, Landry Breuil wrote:
 On Sun, May 27, 2018 at 09:56:25PM +0200, Landry Breuil wrote:
> On Sun, May 27, 2018 at 09:41:26PM +0200, viq wrote:
>> On Sun, May 27, 2018 at 10:19 AM, Landry Breuil 
>>> wrote:
>>
>>> On Sun, May 27, 2018 at 09:59:49AM +0200, viq wrote:
 Currently davical is broken with PHP 7 due to old version of AWL
>>> that
 doesn't work there.
 I'll try and cook up an update, but feel free to beat me to it ;)
>>>
>>> Per https://gitlab.com/davical-project/awl/blob/master/ChangeLog
>>> there's
>>> been some php7 changes, how 'broken' is davical ?
>>>
>>
>> Getting 408 and following error:
>> PHP message: PHP Fatal error:  'break' not in the 'loop' or 'switch'
>> context in /awl/inc/AwlQuery.php on line 261
>> and sync clients don't work, so "very".
>>
>>
>>> https://gitlab.com/davical-project/awl/issues/11 ? one of
>>> https://gitlab.com/davical-project/awl/issues ?
>>
>>
>> This specific error seems to be addressed by
>> https://gitlab.com/davical-project/awl/merge_requests/6
>
> Good, so a first shot would be to update to 0.56 as it contains this
>>> MR,
> and then eventually updating awk & davical together in a second time.

 Oh well according to

>>> https://gitlab.com/davical-project/davical/commit/348532e13b8a8377aa069bdd1cb98eb5d9f00da9
 davical needs an update too to work with php7. Blarf.
>>>
>>> So here are two quick diffs, totally untested yet, but cant be worse
>>> than being broken with php 7.
>>>
>>
>> I may have gotten rusty, but those diffs fail to apply for me.
>>
>>>
> 
> Ha, how old was the tree you diffed from Landry?! :-)
> 
> Here it is rebased against -current
> 
> 
> Index: productivity/davical/Makefile
> ===
> RCS file: /cvs/ports/productivity/davical/Makefile,v
> retrieving revision 1.20
> diff -u -p -r1.20 Makefile
> --- productivity/davical/Makefile 22 May 2018 08:18:08 -  1.20
> +++ productivity/davical/Makefile 28 May 2018 11:54:02 -
> @@ -1,38 +1,36 @@
> -# $OpenBSD: Makefile,v 1.20 2018/05/22 08:18:08 sthen Exp $
> +# $OpenBSD: Makefile,v 1.19 2017/03/24 18:29:37 landry Exp $
>  
>  COMMENT =CalDAV/CardDav calendar/contacts server
>  
> -GITLAB_PROJECT = davical
> -GITLAB_ACCOUNT = davical-project
> -GITLAB_TAG = r1.1.3.1
> -DISTNAME =   ${GITLAB_PROJECT}-${GITLAB_TAG:S/r//}
> +DISTNAME =   davical_1.1.7.orig
> +PKGNAME =davical-1.1.7
> +EXTRACT_SUFX =   .tar.xz
>  CATEGORIES = productivity net
> -REVISION =   4
>  
>  HOMEPAGE =   http://www.davical.org/
> +MASTER_SITES =   https://www.davical.org/downloads/
>  
>  MAINTAINER = Landry Breuil 
>  
>  # GPLv2+
>  PERMIT_PACKAGE_CDROM =   Yes
>  
> -MASTER_SITES =   https://rhaalovely.net/stuff/
> -
> +WRKSRC=  ${WRKDIR}
>  MODULES =lang/php
>  PREFIX = ${VARBASE}/www
>  INSTDIR =${PREFIX}/davical
> -WRKDIST =${WRKDIR}/${GITLAB_PROJECT}.git
>  TINSTDIR =   ${TRUEPREFIX}/davical
>  
>  SUBST_VARS = TINSTDIR
>  
>  RUN_DEPENDS +=   lang/php/${MODPHP_VERSION},-curl \
>   lang/php/${MODPHP_VERSION},-pdo_pgsql \
> - www/awl>=0.55 \
> + www/awl>=0.59 \
>   devel/p5-YAML \
>   databases/p5-DBD-Pg
>  
>  NO_BUILD =   Yes
> +# some tests but makefile need patching
>  NO_TEST =Yes
>  PKG_ARCH =   *
>  
> Index: productivity/davical/distinfo
> ===
> RCS file: /cvs/ports/productivity/davical/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- productivity/davical/distinfo 23 Nov 2014 08:48:27 -  1.3
> +++ productivity/davical/distinfo 28 May 2018 11:54:02 -
> @@ -1,2 +1,2 @@
> -SHA256 (davical-1.1.3.1.tar.gz) = 
> RDnC3wBSJBtlxh608LEMQG2Tr9ZaXMa1I7WXwKewXBU=
> -SIZE (davical-1.1.3.1.tar.gz) = 3031220
> +SHA256 

Re: [matth...@herrb.eu: remove 2 obsolete libraries from Xenocara]

2018-05-20 Thread Nigel Taylor
Ok.

Built on amd64 here, with libraries removed. Ready to build packages
with these changes when snapshot is available.


On 05/20/18 10:45, Matthieu Herrb wrote:
> The xenocara part is now committed. Ok for the ports diff ?
> 
> - Forwarded message from Matthieu Herrb  -
> 
> Date: Sat, 28 Apr 2018 19:24:28 +0200
> From: Matthieu Herrb 
> To: t...@openbsd.org
> Subject: remove 2 obsolete libraries from Xenocara
> 
> Hi,
> 
> libXfontcache and libXxf86misc are implementing the client part of X
> extensions that have been disabled/removed for a while in the X
> server. So builing them or linking to them is useless.
> 
> The patch below stops building them in xenocara. A few ports where
> using libXxf86misc. Rebuilding them without this library just requires
> an update to WANTLIB (patch below, too).
> 
> To test make sure you build xenocara with an empty /usr/X11R6 or that
> you remove all files removed from sets manually.
> 
> PS: This also prepares for the switch to xorgproto and xserver 1.20.
> 
> oks?
> 
> [...]
> 
> and the ports diff
> 
> Index: x11/kde/base3/Makefile
> ===
> RCS file: /cvs/OpenBSD/ports/x11/kde/base3/Makefile,v
> retrieving revision 1.158
> diff -u -p -u -r1.158 Makefile
> --- x11/kde/base3/Makefile14 Jan 2018 14:42:18 -  1.158
> +++ x11/kde/base3/Makefile28 Apr 2018 16:45:31 -
> @@ -13,7 +13,7 @@ PKGNAME-en_US = kde3-locale-en_US-${VER
>  PKGNAME-locale = kde3-locale-${VERSION}
>  PKG_ARCH-en_US = *
>  PKG_ARCH-locale =*
> -REVISION-main =  53
> +REVISION-main =  54
>  REVISION-samba = 28
>  REVISION-en_US = 6
>  REVISION-locale =5
> @@ -73,7 +73,7 @@ WANTLIB += art_lgpl_2 fam idn lber-2.4 l
>  
>  WANTLIB-main =  ${WANTLIB} c sndio GL GLU Xau Xcomposite
>  WANTLIB-main += Xcursor Xdamage Xdmcp Xfixes Xft Xi Xinerama Xmu
> -WANTLIB-main += Xrandr Xss Xtst Xxf86misc Xxf86vm X11-xcb drm
> +WANTLIB-main += Xrandr Xss Xtst Xxf86vm X11-xcb drm
>  WANTLIB-main += glapi xcb-dri2 xcb-glx xkbfile
>  WANTLIB-main += ${KDE}/artsflow ${KDE}/artsflow_idl ${KDE}/artskde
>  WANTLIB-main += ${KDE}/kabc ${KDE}/katepartinterfaces ${KDE}/kdefakes
> Index: x11/mate/screensaver/Makefile
> ===
> RCS file: /cvs/OpenBSD/ports/x11/mate/screensaver/Makefile,v
> retrieving revision 1.5
> diff -u -p -u -r1.5 Makefile
> --- x11/mate/screensaver/Makefile 10 Feb 2018 15:07:17 -  1.5
> +++ x11/mate/screensaver/Makefile 28 Apr 2018 16:45:37 -
> @@ -4,11 +4,13 @@ COMMENT=MATE screensaver
>  
>  MATE_PROJECT=mate-screensaver
>  
> +REVISION=0
> +
>  # LGPLv2
>  PERMIT_PACKAGE_CDROM=Yes
>  
>  WANTLIB += GL ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage Xext
> -WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xss Xtst Xxf86misc Xxf86vm
> +WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xss Xtst Xxf86vm
>  WANTLIB += c dconf drm epoxy expat ffi fontconfig freetype gdk_pixbuf-2.0
>  WANTLIB += gio-2.0 glapi glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
>  WANTLIB += iconv intl lzma m pcre pixman-1 png pthread
> Index: x11/mate/settings-daemon/Makefile
> ===
> RCS file: /cvs/OpenBSD/ports/x11/mate/settings-daemon/Makefile,v
> retrieving revision 1.8
> diff -u -p -u -r1.8 Makefile
> --- x11/mate/settings-daemon/Makefile 27 Apr 2018 12:09:19 -  1.8
> +++ x11/mate/settings-daemon/Makefile 28 Apr 2018 16:45:37 -
> @@ -4,12 +4,13 @@ COMMENT=MATE settings daemon
>  
>  MATE_PROJECT=mate-settings-daemon
>  MATE_VERSION=1.20.1
> +REVISION=0
>  
>  # GPLv2
>  PERMIT_PACKAGE_CDROM=Yes
>  
>  WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
> -WANTLIB += Xinerama Xrandr Xrender Xxf86misc c dconf epoxy expat
> +WANTLIB += Xinerama Xrandr Xrender c dconf epoxy expat
>  WANTLIB += ffi fontconfig freetype gdk_pixbuf-2.0 gio-2.0 glib-2.0
>  WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 iconv intl lzma
>  WANTLIB += m pcre pixman-1 png pthread xcb
> Index: x11/xscreensaver/Makefile
> ===
> RCS file: /cvs/OpenBSD/ports/x11/xscreensaver/Makefile,v
> retrieving revision 1.95
> diff -u -p -u -r1.95 Makefile
> --- x11/xscreensaver/Makefile 26 Apr 2018 20:13:04 -  1.95
> +++ x11/xscreensaver/Makefile 28 Apr 2018 16:45:46 -
> @@ -5,6 +5,8 @@ COMMENT=  screen saver and locker for th
>  # XXX x11/kde4/artwork plist may need regen if an update adds a new hack.
>  DISTNAME=xscreensaver-5.39
>  
> +REVISION=0
> +
>  CATEGORIES=  x11
>  
>  HOMEPAGE=http://www.jwz.org/xscreensaver/
> @@ -13,7 +15,7 @@ HOMEPAGE=   http://www.jwz.org/xscreensav
>  

CVS: cvs.openbsd.org: ports

2018-05-16 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2018/05/16 03:20:05

Modified files:
graphics/shotwell: Makefile 

Log message:
resync WANTLIB
Ok aja@



CVS: cvs.openbsd.org: ports

2018-05-14 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2018/05/14 23:15:21

Modified files:
games/tome4/pkg: PLIST-main 

Log message:
Update PLIST-main fails to find README file when building.
Ok jca@



Re: Add BDEP boost to arx-libertatis

2018-05-08 Thread Nigel Taylor
I was going to report this as I hit the problem building this.

I suggest that more is required, how exactly are boost headers used? A
RUN_DEPENDS may have to be added for boost.

I haven't looked to see if there is a way to disable the need for boost.

The REVISION bump is normally not required for build only issues.



On 05/08/18 19:14, Thomas Frohwein wrote:
> Sorry, this was missed. arx-libertatis uses boost (headerfiles only).
> The following diff should fix this. 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/arx-libertatis/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- Makefile  6 May 2018 15:15:00 -   1.1.1.1
> +++ Makefile  8 May 2018 18:11:28 -
> @@ -9,6 +9,7 @@ GH_ACCOUNT =  arx
>  GH_PROJECT = ArxLibertatis
>  GH_TAGNAME = 1.1.2-r1
>  PKGNAME =arx-libertatis-${GH_TAGNAME:S/-r/pl/}
> +REVISION =   0
>  
>  # GPLv3+, fonts are SIL OFL 1.1 license
>  PERMIT_PACKAGE_CDROM =   Yes
> @@ -21,6 +22,7 @@ COMPILER =  base-clang ports-gcc ports-cl
>  
>  MODULES =devel/cmake
>  
> +BUILD_DEPENDS =  devel/boost>=1.48
>  LIB_DEPENDS =audio/openal \
>   devel/sdl \
>   graphics/glew
> 
> 



CVS: cvs.openbsd.org: ports

2018-04-29 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2018/04/29 05:52:55

Modified files:
devel/p5-Module-Install: Makefile 

Log message:
Add missing BDEP for v1.18 v1.19 to follow
Ok aja



CVS: cvs.openbsd.org: ports

2018-04-29 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2018/04/29 05:18:13

Modified files:
devel/p5-Module-ScanDeps: Makefile 
devel/p5-Module-ScanDeps/pkg: DESCR 

Log message:
Update DESCR for OpenBSD path
Ok aja



CVS: cvs.openbsd.org: ports

2018-04-24 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2018/04/24 13:21:52

Modified files:
x11/kde/base3/patches: patch-kioslave_man_man2html_cpp 
Added files:
x11/kde/base3/patches: 
   patch-kcontrol_kfontinst_kfontinst_Main_cpp 
   patch-kwin_client_cpp 

Log message:
Fixes for clang6
Ok espie@



Re: clang6 fallout

2018-04-24 Thread Nigel Taylor
On 04/24/18 17:32, Marc Espie wrote:
> On Sat, Apr 21, 2018 at 09:38:58PM +0100, Nigel Taylor wrote:
>> On 04/21/18 19:58, Nigel Taylor wrote:
>>> On 04/20/18 16:20, Christian Weisgerber wrote:
>>>> Updated list as of Apr 20, 15:00 UTC.
>>>> http://build-failures.rhaalovely.net/amd64/2018-04-19/
>>>>
>>>> cad/kicad
>>>> graphics/aqsis
>>>> multimedia/k3b-kde4
>>>> multimedia/mlt
>>>> x11/kde/base3
>>>> x11/kde/games3
>>>> x11/kde4/bovo
>>>> x11/kde4/kopete
>>>> x11/kde4/kross-interpreters
>>>> x11/kde4/kuser
>>>> x11/kde4/p5-qt
>>>> x11/kde4/pim-runtime
>>>> x11/kde4/py-kde
>>>> x11/kde4/rocs
>>>> x11/kde4/ruby-qt
>>>> x11/kde4/superkaramba
>>>>
>>>> I think all important ports build now.  Let's mop up the rest!
>>>>
>>>
>>> x11/kde/games3
>>>
>>> broad.cpp - uses time(time_t *)0) elsewhere in board.cpp.
>>>
>>> Haven't bumped as doing _SYSTEM_VERSION
>>>
>>> Ok?
>>>
>>> Looking at base3 next but already have changes to base3 from upstream
>>> trinity desktop, that maintains kde 3. Changes stop the mime reports
>>> when doing package add.
>>>
>>> See
>>>
>>> http://mirror.git.trinitydesktop.org/cgit/tdebase/
>>>
>>
>> x11/kde/base3 updates attached.
>>
>> Mime fixes, partly from upstream trinity desktop. To stop pkg_add -u
>> displaying endless mime type missing.
>>
>> clang6 fixes - it builds, not tested need to have my runtime set, one
>> change from upstream trinity desktop, others add white space, and cast
>> to char.
>>
>> Ok?
> 
> Please separate mime-fixes from build fixes...
> 
build fixes are attached ...

patches/patch-kioslave_man_man2html_cpp

Add cast's

patches/patch-kwin_client_cpp

Remove None - from upstream trinity desktop

patches/patch-kcontrol_kfontinst_kfontinst_Main_cpp

add while spaces.

Ok?


The mime fixes I've been using since Oct 2017, they pre-date the build
fixes, all but one from upstream trinity desktop, plus needs revision
bump in Makefile.

these stop pkg_add -u outputting mime type missing messages every time
desktop update script is run. I'll produce another diff once clang6
changes are in.
Index: patches/patch-kioslave_man_man2html_cpp
===
RCS file: /home/cvs/ports/x11/kde/base3/patches/patch-kioslave_man_man2html_cpp,v
retrieving revision 1.14
diff -u -p -r1.14 patch-kioslave_man_man2html_cpp
--- patches/patch-kioslave_man_man2html_cpp	24 Oct 2007 21:52:16 -	1.14
+++ patches/patch-kioslave_man_man2html_cpp	21 Apr 2018 20:07:14 -
@@ -1,6 +1,16 @@
 $OpenBSD: patch-kioslave_man_man2html_cpp,v 1.14 2007/10/24 21:52:16 espie Exp $
 kioslave/man/man2html.cpp.orig	Mon Oct  8 11:51:22 2007
-+++ kioslave/man/man2html.cpp	Thu Oct 18 14:52:57 2007
+Index: kioslave/man/man2html.cpp
+--- kioslave/man/man2html.cpp.orig
 kioslave/man/man2html.cpp
+@@ -656,7 +656,7 @@ static void fill_old_character_definitions( void )
+ for (size_t i = 0; i < sizeof(standardchar)/sizeof(CSTRDEF); i++)
+ {
+ const int nr = standardchar[i].nr;
+-const char temp[3] = { nr / 256, nr % 256, 0 };
++const char temp[3] = { (char)(nr / 256), (char)(nr % 256), 0 };
+ QCString name( temp );
+ s_characterDefinitionMap.insert( name, StringDefinition( standardchar[i].slen, standardchar[i].st ) );
+ }
 @@ -2706,6 +2706,7 @@ static const char *section_list[] = {
  "3L", "Lightweight Processes Library",
  "3M", "Mathematical Library",
Index: patches/patch-kwin_client_cpp
===
RCS file: patches/patch-kwin_client_cpp
diff -N patches/patch-kwin_client_cpp
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-kwin_client_cpp	21 Apr 2018 19:41:39 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: kwin/client.cpp
+--- kwin/client.cpp.orig
 kwin/client.cpp
+@@ -2057,7 +2057,7 @@ bool Client::getWindowOpacity() //query translucency s
+ int format, result;
+ unsigned long n, left;
+ result = XGetWindowProperty(qt_xdisplay(), window(), atoms->net_wm_window_opacity, 0L, 1L, False, XA_CARDINAL, , , , , /*(unsigned char **)*/ );
+-if (result == Success && data != None && format == 32 )
++if (result == Success && data && format == 32 )
+ {
+ opacity_ = *reinterpret_cast< long* >( data );
+ custom_opacity = true;
Index: patches/patch-kcontrol_kfontinst_kfontinst_Main_cpp
==

Re: dpb: packages not built, in 'H' state (no NFS, local build)

2018-04-22 Thread Nigel Taylor
On 04/22/18 10:45, Andreas Kusalananda Kähäri wrote:
> On Sun, Apr 22, 2018 at 10:01:28AM +0100, Nigel Taylor wrote:
>> On 04/22/18 09:35, Andreas Kusalananda Kähäri wrote:
>>> Hi,
>>>
>>> I'm using dpb in combination with proot to build a subset of packages on
>>> my local machine.  I quite often have an issue with packages not getting
>>> built and instead being listed as in the 'H' state.  According to the
>>> dpb(1) manual, this is due to "package still not found due to nfs on
>>> this run", but I'm not mounting anything on NFS.
>>>
>>> Examples of packages that ended up in this state in my most recent
>>> build:
>>>
>>> lang/python/2.7
>>> devel/git
>>> devel/shellcheck
>>>
>>> Python 2.7 (and 3.6) often end up in 'H'.
>>>
>>> What are the other reasons this may happen?
>>>
>>> Regards,
>>>
>> I seen this when I've updated the ports tree while dpb is running, the
>> last in the list devel/shellcheck, has only recently been updated, so
>> revision has changed from p0 to p1, you might have built p1 revision,
>> but dpb is still looking for p0 revision as it doesn't rescan the ports
>> tree once building started, so dpb has information that devel/shellcheck
>> has been built, but can't see the matching package.
>>
>> This is the one I know off.
>>
> 
> Thanks.  This does however not apply to my setup.  I make sure the
> usr/ports directory in the chroot directory is up to date before
> starting dpb, and I don't touch it while it's running.  Also, re-running
> the build will quickly cycle through all packages and dependencies and
> immediately put the same packages in the 'H' state.
> 
> FWIW, I run dpb with
> 
> dpb -B "$chroot_dir" -s -uU -R -M 2G \
> -P "$HOME/packages.txt"
> 
> and I build the proot with the following configuration:
> 
> actions=unpopulate
> chroot=/extra/proot
> preserve=/usr/ports
> 
> After building the proot, I rsync over the ports directory from outside
> the chroot (while doing this, I make sure that the two copies of
> usr/ports are identical).
> 
> The ports that end up in the 'H' state builds just fine in or outside
> the chroot when I do "make package".
> 
> 
> 
> 

I use a machine dedicated for building, I don't use
-u -U -R -M -B -P options.

-R is known to have issues. I used to use -R now I get around this, by
using sqlports from previous build and the log from my cvs update to
find packages that need rebuilding including dependencies and shared
libs in WANTLIB and remove them before dpb is run.

-M need all the memory to build some ports, until I add more RAM. Think
there are also issues, or used to be. Need to set USE_MFS, WRKOBJDIR_MFS
if comparing make to dpb.

-u, -U - don't have any packages installed that haven't been built by
current dpb run like -R known issues, or restarted run.

-B I don't use proot, as using dedicated build machine.

-P will read from files on command line by default not needed.

My encounter with 'H' are on a different set up, you need someone using
dpb in the same manner as you to comment.



Re: dpb: packages not built, in 'H' state (no NFS, local build)

2018-04-22 Thread Nigel Taylor
On 04/22/18 09:35, Andreas Kusalananda Kähäri wrote:
> Hi,
> 
> I'm using dpb in combination with proot to build a subset of packages on
> my local machine.  I quite often have an issue with packages not getting
> built and instead being listed as in the 'H' state.  According to the
> dpb(1) manual, this is due to "package still not found due to nfs on
> this run", but I'm not mounting anything on NFS.
> 
> Examples of packages that ended up in this state in my most recent
> build:
> 
> lang/python/2.7
> devel/git
> devel/shellcheck
> 
> Python 2.7 (and 3.6) often end up in 'H'.
> 
> What are the other reasons this may happen?
> 
> Regards,
> 
I seen this when I've updated the ports tree while dpb is running, the
last in the list devel/shellcheck, has only recently been updated, so
revision has changed from p0 to p1, you might have built p1 revision,
but dpb is still looking for p0 revision as it doesn't rescan the ports
tree once building started, so dpb has information that devel/shellcheck
has been built, but can't see the matching package.

This is the one I know off.



Re: clang6 fallout

2018-04-21 Thread Nigel Taylor
On 04/21/18 19:58, Nigel Taylor wrote:
> On 04/20/18 16:20, Christian Weisgerber wrote:
>> Updated list as of Apr 20, 15:00 UTC.
>> http://build-failures.rhaalovely.net/amd64/2018-04-19/
>>
>> cad/kicad
>> graphics/aqsis
>> multimedia/k3b-kde4
>> multimedia/mlt
>> x11/kde/base3
>> x11/kde/games3
>> x11/kde4/bovo
>> x11/kde4/kopete
>> x11/kde4/kross-interpreters
>> x11/kde4/kuser
>> x11/kde4/p5-qt
>> x11/kde4/pim-runtime
>> x11/kde4/py-kde
>> x11/kde4/rocs
>> x11/kde4/ruby-qt
>> x11/kde4/superkaramba
>>
>> I think all important ports build now.  Let's mop up the rest!
>>
> 
> x11/kde/games3
> 
> broad.cpp - uses time(time_t *)0) elsewhere in board.cpp.
> 
> Haven't bumped as doing _SYSTEM_VERSION
> 
> Ok?
> 
> Looking at base3 next but already have changes to base3 from upstream
> trinity desktop, that maintains kde 3. Changes stop the mime reports
> when doing package add.
> 
> See
> 
> http://mirror.git.trinitydesktop.org/cgit/tdebase/
> 

x11/kde/base3 updates attached.

Mime fixes, partly from upstream trinity desktop. To stop pkg_add -u
displaying endless mime type missing.

clang6 fixes - it builds, not tested need to have my runtime set, one
change from upstream trinity desktop, others add white space, and cast
to char.

Ok?

The rest I don't build kde4, qt5 too much bloat.
Index: patches/patch-kcontrol_kfontinst_kfontinst_Main_cpp
===
RCS file: patches/patch-kcontrol_kfontinst_kfontinst_Main_cpp
diff -N patches/patch-kcontrol_kfontinst_kfontinst_Main_cpp
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-kcontrol_kfontinst_kfontinst_Main_cpp	21 Apr 2018 19:41:18 -
@@ -0,0 +1,43 @@
+$OpenBSD$
+
+Index: kcontrol/kfontinst/kfontinst/Main.cpp
+--- kcontrol/kfontinst/kfontinst/Main.cpp.orig
 kcontrol/kfontinst/kfontinst/Main.cpp
+@@ -69,22 +69,22 @@ static const char * getFile(const char *entry, const c
+ 
+ static const char * constXConfigFiles[]=
+ {   
+-"/etc/X11/"KFI_XORGCFG,
+-"/etc/X11/"KFI_XORGCFG"-4",
+-"/etc/"KFI_XORGCFG,
+-"/usr/X11R6/etc/X11/"KFI_XORGCFG,
+-"/usr/X11R6/etc/X11/"KFI_XORGCFG"-4",
+-"/usr/X11R6/lib/X11/"KFI_XORGCFG,
+-"/usr/X11R6/lib/X11/"KFI_XORGCFG"-4",
++"/etc/X11/" KFI_XORGCFG,
++"/etc/X11/" KFI_XORGCFG "-4",
++"/etc/" KFI_XORGCFG,
++"/usr/X11R6/etc/X11/" KFI_XORGCFG,
++"/usr/X11R6/etc/X11/" KFI_XORGCFG "-4",
++"/usr/X11R6/lib/X11/" KFI_XORGCFG,
++"/usr/X11R6/lib/X11/" KFI_XORGCFG "-4",
+ 
+-"/etc/X11/"KFI_XF86CFG"-4",
+-"/etc/X11/"KFI_XF86CFG,
+-"/etc/"KFI_XF86CFG"-4",
+-"/etc/"KFI_XF86CFG,
+-"/usr/X11R6/etc/X11/"KFI_XF86CFG"-4",
+-"/usr/X11R6/etc/X11/"KFI_XF86CFG,
+-"/usr/X11R6/lib/X11/"KFI_XF86CFG"-4",
+-"/usr/X11R6/lib/X11/"KFI_XF86CFG,
++"/etc/X11/" KFI_XF86CFG "-4",
++"/etc/X11/" KFI_XF86CFG,
++"/etc/" KFI_XF86CFG "-4",
++"/etc/" KFI_XF86CFG,
++"/usr/X11R6/etc/X11/" KFI_XF86CFG "-4",
++"/usr/X11R6/etc/X11/" KFI_XF86CFG,
++"/usr/X11R6/lib/X11/" KFI_XF86CFG "-4",
++"/usr/X11R6/lib/X11/" KFI_XF86CFG,
+ 
+ NULL
+ };  
Index: patches/patch-kcontrol_kfontinst_viewpart_kfontview_desktop
===
RCS file: patches/patch-kcontrol_kfontinst_viewpart_kfontview_desktop
diff -N patches/patch-kcontrol_kfontinst_viewpart_kfontview_desktop
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-kcontrol_kfontinst_viewpart_kfontview_desktop	17 Oct 2017 08:59:53 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: kcontrol/kfontinst/viewpart/kfontview.desktop
+--- kcontrol/kfontinst/viewpart/kfontview.desktop.orig
 kcontrol/kfontinst/viewpart/kfontview.desktop
+@@ -24,7 +24,7 @@ Exec=kfontview %i %u
+ Icon=fonts
+ X-KDE-StartupNotify=true
+ Type=Application
+-MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-otf;application/x-font-ttc;application/x-font-pcf;application/x-font-bdf;fonts/package;
++MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-otf;application/x-font-ttc;application/x-font-pcf;application/x-font-bdf;
+ GenericName=Font Viewer
+ GenericName[af]=Skriftipe Besigter
+ GenericName[ar]=معاين المحرف
Index: patches/patch-kdeprint_printmgr_printers_desktop
===

Re: emulators/mame - build failure amd64

2018-04-21 Thread Nigel Taylor
I used grep in another port, sed -i writes new file even if no changes,
so now sed only changes the files it needs to, leaving timestamp
unchanged on other files. Maybe single quotes around grep string plus \
so search is for "png.h" not pngxh. grep -rl '"png\.h"'

Haven't tried this but looks Ok.

Ok.

On 04/21/18 22:57, Frederic Cambus wrote:
> On Fri, Apr 20, 2018 at 10:57:39PM +0100, Nigel Taylor wrote:
>>
>> Build continues if png package is installed, but note that
>> post extract has
>>
>> @sed -i 's|"png.h"|"localpng.h"|' ${WRKSRC}/src/emu/*.cpp \
>> ${WRKSRC}/src/lib/util/*.cpp ${WRKSRC}/src/tools/*.cpp
>>
>> The source file is not included in the edit.
>>
>> Either png.h needs changing to localpng.h or png package needs to be 
>> installed.
>> Also when fixing a revision bump is required.
> 
> Thanks for pointing this out, I used grep -rl so it won't happen again
> in the future when new files requiring "png.h" are added.
> 
> Comments? OK?
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/emulators/mame/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- Makefile  20 Apr 2018 15:06:22 -  1.5
> +++ Makefile  21 Apr 2018 21:50:19 -
> @@ -9,6 +9,7 @@ COMMENT = Multiple Arcade Machine Emulat
>  V =  196
>  DISTNAME =   mame0${V}s
>  PKGNAME =mame-0.${V}
> +REVISION =   0
>  
>  CATEGORIES = emulators
>  
> @@ -74,8 +75,7 @@ post-extract:
>   ${WRKSRC}/3rdparty/genie/build/gmake.bsd
>   @sed -i 's,"lua","lua${MODLUA_VERSION}",g' ${WRKSRC}/scripts/extlib.lua
>   @mv ${WRKSRC}/src/lib/util/png.h ${WRKSRC}/src/lib/util/localpng.h
> - @sed -i 's|"png.h"|"localpng.h"|' ${WRKSRC}/src/emu/*.cpp \
> - ${WRKSRC}/src/lib/util/*.cpp ${WRKSRC}/src/tools/*.cpp
> + @grep -rl "png.h" ${WRKSRC}/src | xargs sed -i 's|"png.h"|"localpng.h"|'
>   @perl -pi -e 's/\r//g' ${WRKSRC}/makefile ${WRKSRC}/scripts/genie.lua \
>   ${WRKSRC}/3rdparty/genie/build/gmake.bsd/genie.make \
>   ${WRKSRC}/docs/man/* ${WRKSRC}/keymaps/*
> 
> 
> 



Re: devel/shellcheck - dependency issue

2018-04-21 Thread Nigel Taylor
REVISION-main = R looks like a typo, should be kept at 0,

Otherwise ok with me

I would question the use of lang/ghc, as MODULE = lang/ghc already sets
things, then need to use += in BUILD_DEPENDS, for now ok.

On 04/21/18 21:10, Matthias Kilian wrote:
> Hi,
> 
> On Fri, Apr 20, 2018 at 11:00:48PM +0100, Nigel Taylor wrote:
>> Makefile has
>>
>> RUN_DEPENDS-lib =   ${BUILD_DEPENDS}
>>
>> In the case of USE_CCACHE being set to Yes devel/ccache is added to the
>> build dependencies, when not required at runtime.
> 
> Right. The diff basically swaps those two and also removes the
> unneeded empty assignment to LIB_DEPENDS-lib.
> 
> Any objections?
> 
> Ciao,
>   Kili
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/shellcheck/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- Makefile  14 Apr 2018 19:48:36 -  1.2
> +++ Makefile  21 Apr 2018 20:05:38 -
> @@ -7,7 +7,8 @@ COMMENT-lib = ShellCheck library
>  
>  V =  0.4.7
>  DISTNAME =   ShellCheck-${V}
> -REVISION =   0
> +REVISION-main =  R
> +REVISION-lib =   1
>  PKGNAME-main =   shellcheck-${V}
>  PKGNAME-lib =hs-shellcheck-${V}
>  CATEGORIES = devel
> @@ -28,7 +29,8 @@ MODGHC_BUILD =  cabal hackage haddock re
>  
>  MODGHC_PACKAGE_KEY = FGszl8wDu4DoQ1UCsbZPa
>  
> -BUILD_DEPENDS += devel/hs-mtl>=2.2.1 \
> +BUILD_DEPENDS =  ${RUN_DEPENDS-lib}
> +RUN_DEPENDS-lib =devel/hs-mtl>=2.2.1 \
>   devel/hs-parsec \
>   devel/hs-QuickCheck>=2.7.4 \
>   devel/hs-regex-tdfa \
> @@ -36,8 +38,6 @@ BUILD_DEPENDS +=devel/hs-mtl>=2.2.1 \
>   textproc/hs-json
>  LIB_DEPENDS-main =   converters/libiconv
>  RUN_DEPENDS-main =
> -LIB_DEPENDS-lib =
> -RUN_DEPENDS-lib =${BUILD_DEPENDS}
>  
>  NO_TEST =Yes
>  
> 



CVS: cvs.openbsd.org: ports

2018-04-21 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2018/04/21 14:15:49

Added files:
x11/kde/games3/patches: patch-kshisen_board_cpp 

Log message:
clang6 fix
Ok naddy@



Re: clang6 fallout

2018-04-21 Thread Nigel Taylor
On 04/20/18 16:20, Christian Weisgerber wrote:
> Updated list as of Apr 20, 15:00 UTC.
> http://build-failures.rhaalovely.net/amd64/2018-04-19/
> 
> cad/kicad
> graphics/aqsis
> multimedia/k3b-kde4
> multimedia/mlt
> x11/kde/base3
> x11/kde/games3
> x11/kde4/bovo
> x11/kde4/kopete
> x11/kde4/kross-interpreters
> x11/kde4/kuser
> x11/kde4/p5-qt
> x11/kde4/pim-runtime
> x11/kde4/py-kde
> x11/kde4/rocs
> x11/kde4/ruby-qt
> x11/kde4/superkaramba
> 
> I think all important ports build now.  Let's mop up the rest!
> 

x11/kde/games3

broad.cpp - uses time(time_t *)0) elsewhere in board.cpp.

Haven't bumped as doing _SYSTEM_VERSION

Ok?

Looking at base3 next but already have changes to base3 from upstream
trinity desktop, that maintains kde 3. Changes stop the mime reports
when doing package add.

See

http://mirror.git.trinitydesktop.org/cgit/tdebase/

Index: patches/patch-kshisen_board_cpp
===
RCS file: patches/patch-kshisen_board_cpp
diff -N patches/patch-kshisen_board_cpp
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-kshisen_board_cpp	21 Apr 2018 18:33:58 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: kshisen/board.cpp
+--- kshisen/board.cpp.orig
 kshisen/board.cpp
+@@ -730,7 +730,7 @@ void Board::undrawConnection()
+ 	// game is over?
+ 	if(!getHint_I(dummyPath))
+ 	{
+-		time_for_game = (int)difftime( time((time_t)0), starttime);
++		time_for_game = (int)difftime( time((time_t *)0), starttime);
+ 		emit endOfGame();
+ 	}
+ }


devel/shellcheck - dependency issue

2018-04-20 Thread Nigel Taylor
Makefile has

RUN_DEPENDS-lib =   ${BUILD_DEPENDS}

In the case of USE_CCACHE being set to Yes devel/ccache is added to the
build dependencies, when not required at runtime.

This shouldn't be used in Makefile's.



emulators/mame - build failure amd64

2018-04-20 Thread Nigel Taylor
>From dpb log...

Compiling src/devices/bus/iq151/minigraf.cpp...
c++  -O2 -pipe -I/usr/local/include -I/usr/X11R6/include 
-I/usr/local/include/lua-5.3/ -Wno-ignored-qualifiers  -MMD -MP -MP -DPTR64=1 
-DNDEBUG -DCRLF=2 -DLSB_FIRST -DXMD_H -DFLAC__NO_DLL -DNATIVE_DRC=drcbe_x64 
-DLUA_COMPAT_ALL -DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2 -I"../../../../../src/osd" 
-I"../../../../../src/emu" -I"../../../../../src/devices" 
-I"../../../../../src/mame" -I"../../../../../src/lib" 
-I"../../../../../src/lib/util" -I"../../../../../3rdparty" 
-I"../../../../generated/emu" -I"../../../../generated/emu/layout" 
-I"../../../../../3rdparty/asio/include" -I"../../../../../scripts"   -m64 
-pipe -O2 -pipe   -Wno-unknown-pragmas -Wall -Wcast-align -Wundef 
-Wformat-security -Wwrite-strings -Wno-sign-compare -Wno-conversion 
-Wno-error=deprecated-declarations -m64 -x c++ -std=c++14 -Woverloaded-virtual 
-include ../../../../openbsd/obj/x64/Release/emu.h -o 
"../../../../openbsd/obj/x64/Release/src/devices/bus/iq151/minigraf.o" -c 
"../../../../../src/devices/bus/iq151/minigraf.cpp"
../../../../../src/devices/bus/iq151/minigraf.cpp:13:10: fatal error: 'png.h' 
file not found
#include "png.h"
 ^~~
1 error generated.
gmake[2]: *** [optional.make:13472: 
../../../../openbsd/obj/x64/Release/src/devices/bus/iq151/minigraf.o] Error 1
gmake[1]: *** [Makefile:67: optional] Error 2
gmake[1]: Leaving directory 
'/usr/ports/pobj/mame-0.196/mame0196s/build/projects/sdl/mame/gmake-openbsd'
gmake: *** [makefile:1404: openbsd_x64] Error 2
*** Error 2 in emulators/mame (/usr/ports/infrastructure/mk/bsd.port.mk:2741 
'/usr/ports/pobj/mame-0.196/.build_done')
*** Error 1 in emulators/mame (/usr/ports/infrastructure/mk/bsd.port.mk:2418 
'build')
===> Exiting emulators/mame with an error
*** Error 1 in /usr/ports (infrastructure/mk/bsd.port.subdir.mk:147 'build')
Error: job failed with 256 on localhost


Build continues if png package is installed, but note that
post extract has

@sed -i 's|"png.h"|"localpng.h"|' ${WRKSRC}/src/emu/*.cpp \
${WRKSRC}/src/lib/util/*.cpp ${WRKSRC}/src/tools/*.cpp

The source file is not included in the edit.

Either png.h needs changing to localpng.h or png package needs to be installed.
Also when fixing a revision bump is required.



CVS: cvs.openbsd.org: ports

2018-04-07 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2018/04/07 17:15:28

Modified files:
sysutils/sleuthkit: Makefile 
Added files:
sysutils/sleuthkit/patches: patch-tools_srchtools_sigfind_cpp 

Log message:
Fix from upstream githut not released yet for clang 6.0
Ok sthen@



Update: sysutils/sleuthkit clang fallout

2018-04-07 Thread Nigel Taylor
Attach updated

patch is from upstream github

https://github.com/sleuthkit/sleuthkit/commit/acefb22e7d18917d434853b02b6f7e9b5f4d329f#diff-474ff1f8f4117ed01cc6b517b1fb556e

Builds on amd64. Ok?
Index: Makefile
===
RCS file: /home/cvs/ports/sysutils/sleuthkit/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile	14 Mar 2018 12:39:17 -	1.23
+++ Makefile	7 Apr 2018 21:58:06 -
@@ -4,6 +4,7 @@ COMMENT=		forensic toolkit based on TCT
 
 DISTNAME=		sleuthkit-4.6.0
 CATEGORIES=		sysutils security
+REVISION=		0
 
 SHARED_LIBS +=		tsk	1.0 # 17.0
 
Index: patches/patch-tools_srchtools_sigfind_cpp
===
RCS file: patches/patch-tools_srchtools_sigfind_cpp
diff -N patches/patch-tools_srchtools_sigfind_cpp
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-tools_srchtools_sigfind_cpp	7 Apr 2018 21:55:54 -
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+Index: tools/srchtools/sigfind.cpp
+--- tools/srchtools/sigfind.cpp.orig
 tools/srchtools/sigfind.cpp
+@@ -302,7 +302,7 @@ main(int argc, char **argv)
+ break;
+ }
+ else if (retval == -1) {
+-fprintf(stderr, "error reading bytes %"PRIuOFF"\n", i);
++fprintf(stderr, "error reading bytes %" PRIuOFF "\n", i);
+ exit(1);
+ }
+ 
+@@ -312,9 +312,9 @@ main(int argc, char **argv)
+ ((sig_size < 3) || (block[rel_offset + 2] == sig[2])) &&
+ ((sig_size < 4) || (block[rel_offset + 3] == sig[3]))) {
+ if (prev_hit == -1)
+-printf("Block: %"PRIuOFF" (-)\n",  i);
++printf("Block: %" PRIuOFF " (-)\n",  i);
+ else
+-printf("Block: %"PRIuOFF" (+%"PRIuOFF")\n", i,
++printf("Block: %" PRIuOFF " (+%" PRIuOFF ")\n", i,
+(i - prev_hit));
+ 
+ prev_hit = i;


Re: [UPDATE] sysutils/sleuthkit

2018-03-03 Thread nigel
On 03/03/18 08:25, Remi Pointel wrote:
> ping
> 
> On 02/26/18 15:14, Remi Pointel wrote:
>> Hi,
>>
>> this is the diff to update sleuthkit to latest release.
>>
>> Ok?
>>
>> Cheers,
>>
>> Remi.
> 
> 
Been a little occupied with other things. Builds fine on amd64 can't do
much to test.

Ok with me.



CVS: cvs.openbsd.org: ports

2018-02-28 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2018/02/28 07:08:36

Modified files:
multimedia/get_flash_videos: Makefile distinfo 
multimedia/get_flash_videos/pkg: PLIST 

Log message:
Update version and stop using GitHub autogenerated tarball
Ok sthen@



CVS: cvs.openbsd.org: ports

2018-02-09 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2018/02/09 03:41:45

Modified files:
sysutils/burp  : Makefile 

Log message:
Update WANTLIB after net/librsync update
Ok sthen@



Re: [NEW] devel/p5-Time-Local

2018-02-07 Thread Nigel Taylor
On 02/07/18 16:23, James E Keenan wrote:
> Hello ports@,
> 
> Here is a new port, for Perl extension Time-Local (version 1.25).
> 
> From pkg/DESCR:
> 
> Time::Local is a Perl module which efficiently computes time from local
> and GMT time.
> 
> The module provides two functions, timelocal() and timegm(), which are
> the inverse of the Perl 5 built-in functions localtime() and gmtime(),
> respectively.
> 
> Please review.
> 
> Thank you very much.
> Jim Keenan

I am rejecting this.

$ corelist Time::Local

Data for 2017-09-22
Time::Local was first released with perl 5

$ corelist -v v5.24.3 Time::Local
Time::Local 1.2300

Version 1.25 is for Perl 5.26 and later. Don't mix what's in base with
packages.

$ locate Time/Local.
/usr/libdata/perl5/Time/Local.pm
$ locate Time::Local.
/usr/share/man/man3p/Time::Local.3p

So did you test every package using the base Time::Local, and I don't
see any updates to force use of package Time::Local over the base
version for all the packages...



Re: [NEW] textproc/p5-Text-CSV-Hashify

2018-01-20 Thread Nigel Taylor
I just imported before the new tarball, I had removed PLIST.orig.

On 01/20/18 15:20, James E Keenan wrote:
> On 01/20/2018 04:24 AM, Landry Breuil wrote:
>> On Fri, Jan 19, 2018 at 06:43:21PM -0500, James E Keenan wrote:
>>> On 01/07/2018 10:50 PM, James E Keenan wrote:
 Hello ports@,

 Here is a new port, for Perl extension Text-CSV-Hashify (version 0.08).

   From DESCR:

 The Comma-Separated-Value ('CSV') format is the most common way to
 store
 spreadsheets or the output of relational database queries in plain-text
 format.  However, since commas (or other designated field-separator
 characters) may be embedded within data entries, the parsing of
 delimited records is non-trivial.  Fortunately, in Perl this parsing is
 well handled by CPAN distribution Text::CSV.  This permits us to
 address
 more specific data manipulation problems by building modules on top of
 Text::CSV.

 Text::CSV::Hashify is designed for the case where you simply want to
 turn a CSV file into a Perl hash.  In particular, it is designed for
 the
 case where (a) the CSV file's first record is a list of fields in the
 ancestral database table and (b) one field (column) functions as a
 primary key, i.e., each record's entry in that field is non-null and is
 distinct from every other record's entry therein.  Text::CSV::Hashify
 turns that kind of CSV file into one big hash of hashes.

 Text::CSV::Hashify can handle less typical cases; please consult the
 documentation for its other functionalities.

 Please review.

 Thank you very much.
 Jim Keenan


>>>
>>> ping on this new port; please review.  Thank you very much.
>>
>> Port itself looks okay to me to import if anyone with commit access
>> wants to do so, just beware of the PLIST.orig file in the tarball (cvs
>> import will Ignore it anyway)
>>
>> Landry
>>
> 
> Corrected tarball attached.
> 
> Thank you very much.
> Jim Keenan



CVS: cvs.openbsd.org: ports

2018-01-20 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2018/01/20 08:30:58

Modified files:
textproc   : Makefile 

Log message:
add in new port p5-Text-CSV-Hashify



CVS: cvs.openbsd.org: ports

2018-01-20 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2018/01/20 08:23:18

Log message:
CSV file to perl Hashes
Ok landry

Status:

Vendor Tag: nigel
Release Tags:   nigel_20180120

N ports/textproc/p5-Text-CSV-Hashify/Makefile
N ports/textproc/p5-Text-CSV-Hashify/distinfo
N ports/textproc/p5-Text-CSV-Hashify/pkg/DESCR
N ports/textproc/p5-Text-CSV-Hashify/pkg/PLIST

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2018-01-11 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2018/01/11 15:00:07

Modified files:
mail/sendmail  : Makefile 
mail/sendmail/files: site.OS.m4 

Log message:
fix m4 issue with earlier update.
Ok ajacoutot



CVS: cvs.openbsd.org: ports

2017-12-29 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2017/12/29 03:53:48

Modified files:
www/youtube-dl : Makefile distinfo 
www/youtube-dl/pkg: PLIST 

Log message:
Update version to 2017-12-23

ok rsadowski@



CVS: cvs.openbsd.org: ports

2017-12-28 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2017/12/28 14:01:29

Modified files:
www/p5-libwww  : Makefile distinfo 
www/p5-libwww/pkg: PLIST 

Log message:
Update to version 6.27
Remove added FIX_EXTRACT_PERMISIONS

Ok giovanni@ bluhm@



[UPDATE] www/youtube-dl

2017-12-27 Thread Nigel Taylor
Attached update to 2017.12.23 version.

ITV - site has been making changes which means the odd download uses hls 
instead of rtmp.

This is updated to verify download is still possible.
I've gone no further than checking ITV.

2017.11.26 version fails as follows...

$ youtube-dl https://www.itv.com/hub/maigret/2a4244a0004   
WARNING: Assuming --restrict-filenames since file system encoding cannot encode 
all characters. Set the LC_ALL environment variable to fix this.
[ITV] 2a4244a0004: Downloading webpage  
[ITV] 2a4244a0004: Downloading XML
ERROR: ITV said: Video production has no renditions for DotCom platform.; 
please report this issue on https://yt-dl.org/bug . Make sure you are using the 
latest version; see  https://yt-dl.org/update  on how to update. Be sure to 
call youtube-dl with the --verbose flag and include its
 complete output.   

2017-12-23 version the ITV download ok as below...

$ youtube-dl -f hls-767 https://www.itv.com/hub/maigret/2a4244a0004
WARNING: Assuming --restrict-filenames since file system encoding cannot encode 
all characters. Set the LC_ALL environment variable to fix this.


[ITV] 2a4244a0004: Downloading webpage
[ITV] 2a4244a0004: Downloading XML
[ITV] 2a4244a0004: Downloading JSON metadata
[ITV] 2a4244a0004: Downloading m3u8 information
[hlsnative] Downloading m3u8 manifest
[hlsnative] Total fragments: 449
[download] Destination: Maigret_-_Maigret_in_Montmartre-2a4244a0004.mp4
[download] 100% of 473.05MiB in 04:23
[ffmpeg] Fixing malformed AAC bitstream in 
"Maigret_-_Maigret_in_Montmartre-2a4244a0004.mp4"


Issue reported was fixed in 2017.12.14 version and later.

[itv] Improve extraction (#14944)

Index: Makefile
===
RCS file: /home/cvs/ports/www/youtube-dl/Makefile,v
retrieving revision 1.173
diff -u -p -r1.173 Makefile
--- Makefile	4 Dec 2017 13:38:11 -	1.173
+++ Makefile	26 Dec 2017 15:52:17 -
@@ -2,7 +2,7 @@
 
 COMMENT =	CLI program to download videos from YouTube and other sites
 
-VERSION =	2017.11.26
+VERSION =	2017.12.23
 MODPY_EGG_VERSION =	${VERSION:S/.0/./g}
 
 DISTNAME =	youtube-dl-${VERSION}
Index: distinfo
===
RCS file: /home/cvs/ports/www/youtube-dl/distinfo,v
retrieving revision 1.160
diff -u -p -r1.160 distinfo
--- distinfo	4 Dec 2017 13:38:11 -	1.160
+++ distinfo	26 Dec 2017 15:52:50 -
@@ -1,2 +1,2 @@
-SHA256 (youtube-dl-2017.11.26.tar.gz) = R9MK7InNJFa37nAmxmwO5PVqt9JwDESvJ74OAGJ9LVo=
-SIZE (youtube-dl-2017.11.26.tar.gz) = 2839867
+SHA256 (youtube-dl-2017.12.23.tar.gz) = hSBsRqkKiZOxM7ndDg7I/G81gGDf6ltcYHqliptcoYo=
+SIZE (youtube-dl-2017.12.23.tar.gz) = 2859430
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/www/youtube-dl/pkg/PLIST,v
retrieving revision 1.114
diff -u -p -r1.114 PLIST
--- pkg/PLIST	4 Dec 2017 13:38:11 -	1.114
+++ pkg/PLIST	26 Dec 2017 15:55:14 -
@@ -95,6 +95,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}audioboom.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}audiomack.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}awaan.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}aws.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}azmedien.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}baidu.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}bambuser.${MODPY_PYC_MAGIC_TAG}pyc
@@ -218,7 +219,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}eighttracks.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}einthusan.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}eitb.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}ellentv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}ellentube.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}elpais.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}embedly.${MODPY_PYC_MAGIC_TAG}pyc
 

Re: DELETE: www/p5-WWW-YouTube-Download

2017-12-05 Thread Nigel Taylor
On 12/05/17 12:56, Frederic Cambus wrote:
> On Sun, Dec 03, 2017 at 06:51:56PM +, Mikolaj Kucharski wrote:
> 
>>> So I've looked into updating it, but I don't really see a point. Current
>>> version on CPAN doesn't support encrypted signature videos. I don't use
>>> it any more. Anyone has objections to remove it?
>>>
>>> If decision will be to remove it, please review carefully as I'm not
>>> that familiar with ports removal.
>>>
>>> If you really need perl based youtube downloader, I guess you can try:
>>>
>>> https://www.jwz.org/hacks/youtubedown
>>>
>>> otherwise, there are better alternatives.
>>>
>>
>> Ping. Diff at:
>>  https://marc.info/?l=openbsd-ports=151200587924618=2
> 
> Please wait at least one week before pinging, that's the usual delay.
> 
> Nonetheless, I think removing it makes sense and it seems there was no
> objections so far.
> 
> Anyone willing to OK this removal?
> 
> 

it's already been removed

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/12/04 06:09:07

Modified files:
www: Makefile
Removed files:
www/p5-WWW-YouTube-Download: Makefile distinfo
www/p5-WWW-YouTube-Download/pkg: DESCR PLIST

Log message:
remove www/p5-WWW-YouTube-Download, req'd by maintainer Mikolaj Kucharski




Re: new devel/p5-Sub-Attribute

2017-11-29 Thread Nigel Taylor
On 11/29/17 12:37, Alexander Bluhm wrote:
> On Wed, Nov 29, 2017 at 02:22:01AM +0100, Jeremie Courreges-Anglas wrote:
>> It looks like you need those in BUILD_DEPENDS, listed "for authors only"
>> in Makefile.PL:
>>
>>  devel/p5-Module-Install-AuthorTests \
>>  devel/p5-Module-Install-Repository \
>>  devel/p5-Module-Install-XSUtil \
> 
> Oh yes, my fault.
> 
> The "CONFIGURE_STYLE = modinst" deletes the modules from inc.  It
> adds p5-Module-Install as build dependency automatically, but not
> the others.
> 
> In general I think bundling other modules in inc does not fit well
> in our ports tree.  We should use the package that is maintained
> and tested with OpenBSD and not something that is included somewhere.
> Also inc makes it harder to review module updates as you see a lot
> of unreleated stuff.
> 
> That is why I prefer to place a "rm -rf -- ${WRKSRC}/inc" in the
> Makefile.  But I should not forget to replace inc with dependencies.
> 
> New version attached.
> 
> bluhm
> 

I have a modified perl.port.mk I've been using for some time, with
additional dependencies in the ports that need them including new ports
required as a result of removing everything under ${WRKSRC}/inc for all
modinst ports, there might have been some reason for not removing inc
itself just can't recall at this time...

$ cvs -R -q diff -uNp perl.port.mk



Index: perl.port.mk
===
RCS file: /home/cvs/ports/infrastructure/mk/perl.port.mk,v
retrieving revision 1.29
diff -u -p -r1.29 perl.port.mk
--- perl.port.mk26 Apr 2016 10:56:59 -  1.29
+++ perl.port.mk26 Apr 2016 13:20:04 -
@@ -66,7 +66,7 @@ MODPERL_configure = ${_MODPERL_preconfig
 .  if ${CONFIGURE_STYLE:L:Mmodinst}
 BUILD_DEPENDS +=   devel/p5-Module-Install
 CONFIGURE_ARGS +=  --skipdeps
-_MODPERL_preconfig = rm -rf ${WRKSRC}/inc/Module/*Install*
+_MODPERL_preconfig = rm -rf ${WRKSRC}/inc/*
 .  else
 _MODPERL_preconfig = :
 .  endif
$



CVS: cvs.openbsd.org: ports

2017-11-25 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2017/11/25 06:53:26

Modified files:
geo/postgis: Makefile 

Log message:
Add missing dependency on gettext
Ok sthen@ lendry@



Re: update p5-Mojolicious-Plugin-TtRenderer to 1.59

2017-11-11 Thread Nigel Taylor
On 11/11/17 22:30, Remi Locherer wrote:
> On Sat, Nov 11, 2017 at 04:57:43PM +0000, Nigel Taylor wrote:
>> On 11/11/17 15:59, Stuart Henderson wrote:
>>> On 2017/11/11 15:46, Nigel Taylor wrote:
>>>> On 11/11/17 14:19, Stuart Henderson wrote:
>>>>> On 2017/11/11 15:04, Jeremie Courreges-Anglas wrote:
>>>>>> On Sat, Nov 04 2017, Remi Locherer <remi.loche...@relo.ch> wrote:
>>>>>>> Hi,
>>>>>>
>>>>>> H Remi,
>>>>>>
>>>>>>> This updates Mojolicious-Plugin-TtRenderer to 1.59. This is needed
>>>>>>> because of the p5-Mojolicious patch I sent before.
>>>>>>>
>>>>>>> OK?
>>>>>>
>>>>>> My p5-ports-fu is rusty.  Why the move from modbuild to modinst?
>>>>>
>>>>> Upstream change.
>>>>>
>>>>> OK with me.
>>>>>
>>>>>
>>>>
>>>> Not ok with me.
>>>>
>>>> Module::Install and Module::Build are being abandoned and moving back to 
>>>> MakeMaker. 
>>>> Upstream has removed Module::Build, and used MakeMaker, not 
>>>> Module::Install where 
>>>> is the inc/ directory used by Module Install? Where is the actual 
>>>> reference 
>>>> to Module::Install
>>>
>>> Ah that's better again then. It does work with modinst though, and does
>>> fail with modbuild.
>>>
>> Because modbuild uses Build.PL which no longer exists it fails, modinst uses 
>> Makefile.PL same as MakeMaker. Module::Install the Makefile.PL starts with 
>> use Module::Install; so requires Module-Install package, MakeMaker 
>> is part of core perl so just running the Makefile.PL just runs.
>>
>> The difference is installing the extra package p5-Module-Install, and the
>> deletion of inc/ contents, plus extra CONFIGURE_ARGS setting is added for
>> modinst. Works just a few extras that aren't needed.
> 
> This makes sense and it works fine without CONFIGURE_STYLE.
> Thanks for enlighten me! ;-)
> 
>>>> I'm looking on CPAN and I just can't see how this is using Module::Install.
>>>>
>>>> Also tests are failing for me
>>>>
>>>> t/lite_app_with_default_layouts.t   (Wstat: 256 Tests: 3 Failed: 1)
>>>>   Failed test:  3
>>>>   Non-zero exit status: 1
>>>> Files=10, Tests=88,  8 wallclock secs ( 0.04 usr  0.07 sys +  3.81 cusr  
>>>> 1.42 csys =  5.34 CPU)
>>>> Result: FAIL
>>>> Failed 2/10 test programs. 3/88 subtests failed.
>>>> *** Error 255 in 
>>>> /usr/ports/pobj/p5-Mojolicious-Plugin-TtRenderer-1.59/Mojolicious-Plugin-TtRenderer-1.59
>>>>  (Makefile:865 'test_dynamic')
>>>> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2763 
>>>> '/usr/ports/pobj/p5-Mojolicious-Plugin-TtRenderer-1.59/.test_done')
>>>> *** Error 1 in 
>>>> /usr/ports/mystuff/textproc/p5-Mojolicious-Plugin-TtRenderer 
>>>> (/usr/ports/infrastructure/mk/bsd.port.mk:2426 'test')
>>>>
>>>> No mention of failing tests, or reasons given. However this could be down 
>>>> to 
>>>> the fact Mojo hasn't been updated, this being a plugin, then the plugin 
>>>> needs 
>>>> reference to the specific versions of p5-Mojo which work a >= in the RDEP.
>>>> But the Makefile.PL gives Mojo 2.51 and later as working with this.
>>>> Either upstream have missed the dependency update or missed updating,
>>>> tests to match changes made. 
>>>
>>> They succeed with the p5-Mojolicious update that remi@ sent alongside, 
>>> so in that case yes, I agree with adding the version to the dependency.
>>>
>>
>> my revised diff, used updated p5-Mojo. Used 6.33 of Mojo as > 6.24 currently 
>> available in ports, and is the version in the upstream Makefile.PL
>>
> 
> Makes sense to me.
> 
> I could not apply your diff. Looks like tabs have been replaces with
> spaces (happens when copy-pasting).
> 
> Here the regenerated diff with your changes.
> 
> OK?
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/p5-Mojolicious-Plugin-TtRenderer/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- Makefile  20 Mar 2016 19:57:06 -  1.5
> +++ Makefile  11 Nov 2017 22:18:29 -
> @@ -4,7 +4,7 @@ COMMENT = Template 

Re: update p5-Mojolicious-Plugin-TtRenderer to 1.59

2017-11-11 Thread Nigel Taylor
On 11/11/17 15:59, Stuart Henderson wrote:
> On 2017/11/11 15:46, Nigel Taylor wrote:
>> On 11/11/17 14:19, Stuart Henderson wrote:
>>> On 2017/11/11 15:04, Jeremie Courreges-Anglas wrote:
>>>> On Sat, Nov 04 2017, Remi Locherer <remi.loche...@relo.ch> wrote:
>>>>> Hi,
>>>>
>>>> H Remi,
>>>>
>>>>> This updates Mojolicious-Plugin-TtRenderer to 1.59. This is needed
>>>>> because of the p5-Mojolicious patch I sent before.
>>>>>
>>>>> OK?
>>>>
>>>> My p5-ports-fu is rusty.  Why the move from modbuild to modinst?
>>>
>>> Upstream change.
>>>
>>> OK with me.
>>>
>>>
>>
>> Not ok with me.
>>
>> Module::Install and Module::Build are being abandoned and moving back to 
>> MakeMaker. 
>> Upstream has removed Module::Build, and used MakeMaker, not Module::Install 
>> where 
>> is the inc/ directory used by Module Install? Where is the actual reference 
>> to Module::Install
> 
> Ah that's better again then. It does work with modinst though, and does
> fail with modbuild.
> 
Because modbuild uses Build.PL which no longer exists it fails, modinst uses 
Makefile.PL same as MakeMaker. Module::Install the Makefile.PL starts with 
use Module::Install; so requires Module-Install package, MakeMaker 
is part of core perl so just running the Makefile.PL just runs.

The difference is installing the extra package p5-Module-Install, and the
deletion of inc/ contents, plus extra CONFIGURE_ARGS setting is added for
modinst. Works just a few extras that aren't needed.

>> I'm looking on CPAN and I just can't see how this is using Module::Install.
>>
>> Also tests are failing for me
>>
>> t/lite_app_with_default_layouts.t   (Wstat: 256 Tests: 3 Failed: 1)
>>   Failed test:  3
>>   Non-zero exit status: 1
>> Files=10, Tests=88,  8 wallclock secs ( 0.04 usr  0.07 sys +  3.81 cusr  
>> 1.42 csys =  5.34 CPU)
>> Result: FAIL
>> Failed 2/10 test programs. 3/88 subtests failed.
>> *** Error 255 in 
>> /usr/ports/pobj/p5-Mojolicious-Plugin-TtRenderer-1.59/Mojolicious-Plugin-TtRenderer-1.59
>>  (Makefile:865 'test_dynamic')
>> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2763 
>> '/usr/ports/pobj/p5-Mojolicious-Plugin-TtRenderer-1.59/.test_done')
>> *** Error 1 in /usr/ports/mystuff/textproc/p5-Mojolicious-Plugin-TtRenderer 
>> (/usr/ports/infrastructure/mk/bsd.port.mk:2426 'test')
>>
>> No mention of failing tests, or reasons given. However this could be down to 
>> the fact Mojo hasn't been updated, this being a plugin, then the plugin 
>> needs 
>> reference to the specific versions of p5-Mojo which work a >= in the RDEP.
>> But the Makefile.PL gives Mojo 2.51 and later as working with this.
>> Either upstream have missed the dependency update or missed updating,
>> tests to match changes made. 
> 
> They succeed with the p5-Mojolicious update that remi@ sent alongside, 
> so in that case yes, I agree with adding the version to the dependency.
> 

my revised diff, used updated p5-Mojo. Used 6.33 of Mojo as > 6.24 currently 
available in ports, and is the version in the upstream Makefile.PL

With Mojo updated to 7.52 tests for this all passed.

# perl5.024003
# EV  4.22
# ExtUtils::MakeMaker 7.1002
# Mojolicious 7.52
# POSIX   1.65_01
# Template2.27
# Template::Provider  2.94
# Test::More  1.001014
#
#
#
# mojo io loopMojo::Reactor::EV
#
#
#
t/00_diag.t ... ok
t/01_use.t  ok
t/default_handler_as_engine.t . ok
t/default_handler_as_plugin.t . ok
t/default_handler_no_templates_dir.t .. ok
t/lite_app.t .. ok
t/lite_app_with_default_layouts.t . ok
t/multiple_paths.t  ok
t/tt_plugin_lite_app.t  ok
t/two_data.t .. ok
All tests successful.
Files=10, Tests=88,  7 wallclock secs ( 0.07 usr  0.08 sys +  4.04 cusr  1.09 
csys =  5.28 CPU)
Result: PASS



$ cvs -R -q diff -uNp
Index: Makefile
===
RCS file: /home/cvs/ports/textproc/p5-Mojolicious-Plugin-TtRenderer/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile20 Mar 2016 19:57:06 -  1.5
+++ Makefile11 Nov 2017 16:11:45 -
@@ -4,7 +4,7 @@ COMMENT =   Template Renderer Plugin for M
 
 MODULES =  cpan
 PKG_ARCH = *
-DISTNAME = Mojolicious-Plugin-TtRenderer-1.56
+DISTNAME = Mojolicious-Plugin-TtRenderer-1.59
 CATEGORIES =   textproc
 
 # Perl
@@ -12,10 +12,8 @@ PERMIT_PACKAGE_CDROM =  

Re: update p5-Mojolicious-Plugin-TtRenderer to 1.59

2017-11-11 Thread Nigel Taylor
On 11/11/17 14:19, Stuart Henderson wrote:
> On 2017/11/11 15:04, Jeremie Courreges-Anglas wrote:
>> On Sat, Nov 04 2017, Remi Locherer  wrote:
>>> Hi,
>>
>> H Remi,
>>
>>> This updates Mojolicious-Plugin-TtRenderer to 1.59. This is needed
>>> because of the p5-Mojolicious patch I sent before.
>>>
>>> OK?
>>
>> My p5-ports-fu is rusty.  Why the move from modbuild to modinst?
> 
> Upstream change.
> 
> OK with me.
> 
> 

Not ok with me.

Module::Install and Module::Build are being abandoned and moving back to 
MakeMaker. 
Upstream has removed Module::Build, and used MakeMaker, not Module::Install 
where 
is the inc/ directory used by Module Install? Where is the actual reference 
to Module::Install

I'm looking on CPAN and I just can't see how this is using Module::Install.

Also tests are failing for me

t/lite_app_with_default_layouts.t   (Wstat: 256 Tests: 3 Failed: 1)
  Failed test:  3
  Non-zero exit status: 1
Files=10, Tests=88,  8 wallclock secs ( 0.04 usr  0.07 sys +  3.81 cusr  1.42 
csys =  5.34 CPU)
Result: FAIL
Failed 2/10 test programs. 3/88 subtests failed.
*** Error 255 in 
/usr/ports/pobj/p5-Mojolicious-Plugin-TtRenderer-1.59/Mojolicious-Plugin-TtRenderer-1.59
 (Makefile:865 'test_dynamic')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2763 
'/usr/ports/pobj/p5-Mojolicious-Plugin-TtRenderer-1.59/.test_done')
*** Error 1 in /usr/ports/mystuff/textproc/p5-Mojolicious-Plugin-TtRenderer 
(/usr/ports/infrastructure/mk/bsd.port.mk:2426 'test')

No mention of failing tests, or reasons given. However this could be down to 
the fact Mojo hasn't been updated, this being a plugin, then the plugin needs 
reference to the specific versions of p5-Mojo which work a >= in the RDEP.
But the Makefile.PL gives Mojo 2.51 and later as working with this.
Either upstream have missed the dependency update or missed updating,
tests to match changes made. 


Test of previous version 1.56 

t/00_diag.t ... ok
t/00_load.t ... ok
t/default_handler_as_engine.t . ok
t/default_handler_as_plugin.t . ok
t/default_handler_no_templates_dir.t .. ok
t/lite_app.t .. ok
t/lite_app_with_default_layouts.t . ok
t/multiple_paths.t  ok
t/tt_plugin_lite_app.t  ok
t/two_data.t .. ok
All tests successful.
Files=10, Tests=88,  8 wallclock secs ( 0.04 usr  0.16 sys +  3.69 cusr  1.82 
csys =  5.71 CPU)
Result: PASS

Replacing a working version, with a non working one isn't much of an upgrade,
needs some explanation.

Revised diff used

$ cvs -R -q diff -uNp
Index: Makefile
===
RCS file: /home/cvs/ports/textproc/p5-Mojolicious-Plugin-TtRenderer/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile20 Mar 2016 19:57:06 -  1.5
+++ Makefile11 Nov 2017 15:16:29 -
@@ -4,15 +4,13 @@ COMMENT = Template Renderer Plugin for M
 
 MODULES =  cpan
 PKG_ARCH = *
-DISTNAME = Mojolicious-Plugin-TtRenderer-1.56
+DISTNAME = Mojolicious-Plugin-TtRenderer-1.59
 CATEGORIES =   textproc
 
 # Perl
 PERMIT_PACKAGE_CDROM = Yes
 
 CPAN_AUTHOR =  PLICEASE
-
-CONFIGURE_STYLE=   modbuild
 
 RUN_DEPENDS =  sysutils/p5-Capture-Tiny \
textproc/p5-Template \
Index: distinfo
===
RCS file: /home/cvs/ports/textproc/p5-Mojolicious-Plugin-TtRenderer/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo27 Apr 2015 19:38:21 -  1.4
+++ distinfo11 Nov 2017 15:16:15 -
@@ -1,2 +1,2 @@
-SHA256 (Mojolicious-Plugin-TtRenderer-1.56.tar.gz) = 
Tm3uvvu4m2nd+Yz85u4f7aXxABU6PHMMYnwBmKdQXf0=
-SIZE (Mojolicious-Plugin-TtRenderer-1.56.tar.gz) = 25908
+SHA256 (Mojolicious-Plugin-TtRenderer-1.59.tar.gz) = 
kATgC7NAzsh7Kqj+uqpd/vHKWU67jRGWq9NBYufp4p0=
+SIZE (Mojolicious-Plugin-TtRenderer-1.59.tar.gz) = 26180



Re: UPDATE: gpgme-1.9.0

2017-11-07 Thread Nigel Taylor
There is already a post for an update, however that included all the
bindings, for common lisp, qt5, python, python3 as well. From the post...

"I need help with the gpgme update. Special thing here, I need the Qt
bindings because kde-applications/gpgmepp is dead and all dependent
programs work with gpgme-qt now."

Having included qt5 in the incorrect manner, so everything requires qt5
built if they want the gpgme library. I prefer your, version can't check
it fully for a while, visual scan of changes it looks ok, unlike the
previous post.

I prefer yours to go ahead, then make changes to add the bindings later,
start from something working. They took too big a step, lets do one step
at a time, and get this up to date.


On 11/07/17 11:18, Edd Barrett wrote:
> Hi,
> 
> A much needed update to gpgme-1.9.0.
> 
> I noticed we were out of date when a Rust crate I was looking at using
> failed to build due to the old gpgme version.
> 
> The newer version has the possibility to make several language bindings.
> I have disabled them all for now. People can enable them as they become
> needed.
> 
> Also the pthread variant of the shared library has gone, presumably
> because the main shared object is now, since 1.8.0, thread safe
> (according to https://gnupg.org/documentation/manuals/gpgme.pdf).
> 
> I bumped the shared library version because diffing the headers shows
> some deprecated functions being removed.
> 
> I've tested the build of all ports which LIB_DEPEND this (using
> gnupg-2.2.1) and have tested mutt using the new gpgme. Nothing caught
> fire.
> 
> Thoughts? OK?
> 
> 
> Index: Makefile
> ===
> RCS file: /home/edd/source/OpenBSD-CVS/ports/security/gpgme/Makefile,v
> retrieving revision 1.38
> diff -u -p -r1.38 Makefile
> --- Makefile  11 May 2017 00:29:50 -  1.38
> +++ Makefile  7 Nov 2017 09:05:50 -
> @@ -2,12 +2,10 @@
>  
>  COMMENT= GnuPG Made Easy
>  
> -DISTNAME=gpgme-1.6.0
> -REVISION=0
> +DISTNAME=gpgme-1.9.0
>  CATEGORIES=  security devel
>  
> -SHARED_LIBS +=  gpgme20.0 # 25.0
> -SHARED_LIBS +=  gpgme-pthread20.0 # 25.0
> +SHARED_LIBS +=  gpgme21.0 # 29.0
>  
>  HOMEPAGE=http://www.gnupg.org/gpgme.html
>  
> @@ -20,9 +18,7 @@ MASTER_SITES=   ${MASTER_SITE_GNUPG:=gpgm
>  EXTRACT_SUFX=.tar.bz2
>  
>  CONFIGURE_STYLE= gnu
> -
> -# not without -pthread
> -CONFIGURE_ENV += gpgme_cv_tls_works=no
> +CONFIGURE_ARGS +=--enable-languages=''
>  
>  # Requires gpgsm (gnupg 2.x) during build, but can run with any gnupg.
>  BUILD_DEPENDS=   gnupg->=2:security/gnupg2
> @@ -33,10 +29,9 @@ LIB_DEPENDS=   devel/gettext \
>   security/libgpg-error>=1.4 \
>   security/libassuan
>  
> -TEST_DEPENDS +=  security/gnupg
> +TEST_DEPENDS +=  security/gnupg2
>  
>  # needed for the regression tests
>  USE_GMAKE=   Yes
> -
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /home/edd/source/OpenBSD-CVS/ports/security/gpgme/distinfo,v
> retrieving revision 1.12
> diff -u -p -r1.12 distinfo
> --- distinfo  19 Sep 2016 17:13:55 -  1.12
> +++ distinfo  7 Nov 2017 09:05:50 -
> @@ -1,2 +1,2 @@
> -SHA256 (gpgme-1.6.0.tar.bz2) = sJ3kGXrCgLECCA4J6uxiEdCB7/8ZY794Ic+PT5kWCZ0=
> -SIZE (gpgme-1.6.0.tar.bz2) = 983573
> +SHA256 (gpgme-1.9.0.tar.bz2) = Gyn+24v613XnDq+sWwWQYhaDstmGnbmUVo5kAfQDTOs=
> +SIZE (gpgme-1.9.0.tar.bz2) = 1344222
> Index: pkg/PLIST
> ===
> RCS file: /home/edd/source/OpenBSD-CVS/ports/security/gpgme/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -r1.8 PLIST
> --- pkg/PLIST 19 Sep 2016 17:13:55 -  1.8
> +++ pkg/PLIST 7 Nov 2017 09:05:50 -
> @@ -3,16 +3,7 @@ bin/gpgme-config
>  @bin bin/gpgme-tool
>  include/gpgme.h
>  @info info/gpgme.info
> -lib/libgpgme-pthread.a
> -lib/libgpgme-pthread.la
> -@lib lib/libgpgme-pthread.so.${LIBgpgme-pthread_VERSION}
>  lib/libgpgme.a
>  lib/libgpgme.la
>  @lib lib/libgpgme.so.${LIBgpgme_VERSION}
>  share/aclocal/gpgme.m4
> -@comment share/common-lisp/
> -@comment share/common-lisp/source/
> -@comment share/common-lisp/source/gpgme/
> -@comment share/common-lisp/source/gpgme/gpgme-package.lisp
> -@comment share/common-lisp/source/gpgme/gpgme.asd
> -@comment share/common-lisp/source/gpgme/gpgme.lisp
> 



Re: [update] www/p5-libwww 6.15 -> 6.26 now 6.27

2017-11-05 Thread Nigel Taylor
On 11/05/17 15:38, Giovanni Bechis wrote:
> On Sat, Nov 04, 2017 at 11:45:09AM +0000, Nigel Taylor wrote:
>> Ping retested with perl 5.24.3 no issues seen.
>>
>> Ok for this update?
>>
> what about adding LWP::Protocol::https to run depends as suggested by 
> upstream ?
> anyway ok for me.
>  Cheers
>   Giovanni
> 
LWP-Protocol-https extends libwww you have to have libwww first so
LWP-Protocol-https depends on libwww being present, but libwww can be
present without LWP-Protocol-https. The suggestion is that you install
the extension when needed for https. So ports using https should have a
RDEP www/p5-LWP-Protocol-https which depends on www/p5-libwww, ports
using just http should have a RDEP www/p5-libwww.

There are a number of distributions that did the dependency the other
way around, which mean you can never have a cut down install for http
only, it also creates a dependency loop to test LWP-Protocol-https you
need libwww which needs LWP-Protocol-https but you haven't built the
LWP-Protocol-https package.

Just doesn't fit in with the ports tree building and testing of
packages, other distributions maybe if you use CPAN to install, build,
test. You build and test p5-libwww and create a package, then you build
and test p5-LWP-Protocol-https using the built/tested p5-libwww package,
then create the package, p5-LWP-Protocol-https never comes before p5-libwww.

>>
>>
>> On 09/24/17 23:02, Nigel Taylor wrote:
>>> On 09/24/17 12:49, Stuart Henderson wrote:
>>>> On 2017/09/23 23:21, Nigel Taylor wrote:
>>>>> This has been taken over by new CPAN author.
>>>>>
>>>>> Changes most code cleanup and bug fixes.
>>>>>
>>>>> Built tested on amd64.
>>>>>
>>>>> Used with get_iplayer/get_flash_videos for some time on main desktop.
>>>>>
>>>>> Ok?
>>>>
>>>> I don't see any problem with the diff itself, but it's the wrong time to
>>>> update a module affecting ~100 ports (not helped by being an interpreted
>>>> language so problems in p5-* often don't show up until runtime).
>>>>
>>>> So, OK for after unlock.
>>>>
>>>>
>>> Anyway version 6.27 is now out. I've moved on to that now.
>>>
>>> Built and tested on amd64.
>>>
>>> Change history for libwww-perl
>>>
>>> 6.27  2017-09-21
>>> - Switch to Getopt::Long in lwp-download (GH #262)
>>> - Fix lwp-request -C (GH #261)
>>> - Hide LWP::Protocol::http::Socket,
>>> LWP::Protocol::http::SocketMethods and
>>>   LWP::Debug::TraceHTTP::Socket from PAUSE
>>> - Add tests for the "get" & "head" functions (GH #252)
>>> - Update lwpcook.pod (GH #256)
>>> - Handle undefined values in ->credentials (GH #157)
>>> - Fix lwp-mirror options checks.
>>> - Update bin/ scripts to use $LWP::VERSION instead of ->Version()
>>> - Improve lwp-download --help (GH #262)
>>>
>>> 6.26  2017-04-12
>>> - Perltidy all apps in the bin/ directory
>>> - Make all apps in bin/ use strict and warnings (RT #92633)
>>> - Fix bug tracker URL in metadata
>>>
>>> 6.25  2017-04-03
>>> - Fix LWP::UserAgent docs for request and request_simple that pointed to
>>>   functions in LWP::Simple rather than LWP::UserAgent
>>> - Moved the official bug tracker to GitHub rather than RT.
>>>
>>> 6.24  2017-03-14
>>> - Document clone methods inability to clone cookie jars (RT #13542)
>>> - It is now possible to set the proxy and no_proxy attributes from the
>>>   constructor of LWP::UserAgent. (GH #124)
>>>
>>> 6.23  2017-03-06
>>> - Fix bug where Protocol::NNTP called undef on a variable before
>>> being done
>>>   using it. (GH PR #121)
>>> - Ran perltidy on LWP::Protocol::NNTP
>>> - Re-organized current documentation set.
>>>
>>> 6.22  2017-03-01
>>> - Update Travis-CI to test on minimum versions of prereqs. (GH PR #109)
>>> - Fix tests that depended on a newer version of HTTP::Message (GH PR
>>> #119)
>>> - Update documentation to reflect behavior difference in ->put()
>>> depending
>>>   on the version of HTTP::Message installed. (GH PR #120)
>>>
>>> 6.21  2017-02-21
>>> - Ensure that LWP::Simple re-exports some HTTP::Status functions
>>>
>>> 6.20  2017-02-21
>>> 

Re: [update] www/p5-libwww 6.15 -> 6.26 now 6.27

2017-11-04 Thread Nigel Taylor
Ping retested with perl 5.24.3 no issues seen.

Ok for this update?



On 09/24/17 23:02, Nigel Taylor wrote:
> On 09/24/17 12:49, Stuart Henderson wrote:
>> On 2017/09/23 23:21, Nigel Taylor wrote:
>>> This has been taken over by new CPAN author.
>>>
>>> Changes most code cleanup and bug fixes.
>>>
>>> Built tested on amd64.
>>>
>>> Used with get_iplayer/get_flash_videos for some time on main desktop.
>>>
>>> Ok?
>>
>> I don't see any problem with the diff itself, but it's the wrong time to
>> update a module affecting ~100 ports (not helped by being an interpreted
>> language so problems in p5-* often don't show up until runtime).
>>
>> So, OK for after unlock.
>>
>>
> Anyway version 6.27 is now out. I've moved on to that now.
> 
> Built and tested on amd64.
> 
> Change history for libwww-perl
> 
> 6.27  2017-09-21
> - Switch to Getopt::Long in lwp-download (GH #262)
> - Fix lwp-request -C (GH #261)
> - Hide LWP::Protocol::http::Socket,
> LWP::Protocol::http::SocketMethods and
>   LWP::Debug::TraceHTTP::Socket from PAUSE
> - Add tests for the "get" & "head" functions (GH #252)
> - Update lwpcook.pod (GH #256)
> - Handle undefined values in ->credentials (GH #157)
> - Fix lwp-mirror options checks.
> - Update bin/ scripts to use $LWP::VERSION instead of ->Version()
> - Improve lwp-download --help (GH #262)
> 
> 6.26  2017-04-12
> - Perltidy all apps in the bin/ directory
> - Make all apps in bin/ use strict and warnings (RT #92633)
> - Fix bug tracker URL in metadata
> 
> 6.25  2017-04-03
> - Fix LWP::UserAgent docs for request and request_simple that pointed to
>   functions in LWP::Simple rather than LWP::UserAgent
> - Moved the official bug tracker to GitHub rather than RT.
> 
> 6.24  2017-03-14
> - Document clone methods inability to clone cookie jars (RT #13542)
> - It is now possible to set the proxy and no_proxy attributes from the
>   constructor of LWP::UserAgent. (GH #124)
> 
> 6.23  2017-03-06
> - Fix bug where Protocol::NNTP called undef on a variable before
> being done
>   using it. (GH PR #121)
> - Ran perltidy on LWP::Protocol::NNTP
> - Re-organized current documentation set.
> 
> 6.22  2017-03-01
> - Update Travis-CI to test on minimum versions of prereqs. (GH PR #109)
> - Fix tests that depended on a newer version of HTTP::Message (GH PR
> #119)
> - Update documentation to reflect behavior difference in ->put()
> depending
>   on the version of HTTP::Message installed. (GH PR #120)
> 
> 6.21  2017-02-21
> - Ensure that LWP::Simple re-exports some HTTP::Status functions
> 
> 6.20  2017-02-21
> - Converted to use Dist::Zilla
> - Moved several tests to xt/author
> 
> 6.192017-02-14
> - Call HTTP::Status constant functions without & (GH#110)
> - Make bin scripts use LWP's version and not maintain their own (PR #54)
> - Fix bug triggered in some cases of auth challenges not having a viable
>   protocol (PR#111)
> - Remove usage of the 'vars' pragma (GH#113)
> 
> 6.182017-02-03
> - Update "timeout" when reusing sockets (PR#90)
> - Fix bug triggered when calling simple_request() with a malformed URL
>   (PR#108)
> 
> 6.172017-01-31
> - Noted another protocol failure message (PR#65)
> - Removed old use of UNIVERSAL::isa() and swapped evals for
> Try::Tiny (PR#105)
> - Standardized the Changes file (GH#106)
> - Fixed documentation error in lwp-request.
> 
> 6.162017-01-18
> - Moved LWP::Protocol::GHTTP into its own dist and removed from here
> (PR#81)
> - Updated test suite to use strict/warnings and Test::More (PR#88)
> - Additional tests for UserAgent coverage (PR#79)
> - Cleaned up documentation formatting and fixed several typos
> (PR#87, PR#93)
> - Stop promoting use of HTTP::Cookies and instead use
> HTTP::CookieJar::LWP (PR#102)
> - Added some new documentation to UserAgent and tutorial (PR#68)
> - Allow default header to carry over when using ->post() in UA (PR#100)
> 



Re: update devel/p5-Module-Install

2017-11-03 Thread Nigel Taylor
Sorry was in a rush, still not really free.

I was going to do the update, just it's not one update as you spotted,
and still have to go back through my old things on ports@ not ok'd yet,
put on hold while ports locked.

p5-Module-Install-ExtraTests

I have that update to go with this, along with updates and other new
p5-Module-Install- packages.

This goes with a modification to perl.bsd.mk

$ cvs -R -q diff -uNp perl.port.mk
Index: perl.port.mk
===
RCS file: /home/cvs/ports/infrastructure/mk/perl.port.mk,v
retrieving revision 1.29
diff -u -p -r1.29 perl.port.mk
--- perl.port.mk26 Apr 2016 10:56:59 -  1.29
+++ perl.port.mk26 Apr 2016 13:20:04 -
@@ -66,7 +66,7 @@ MODPERL_configure = ${_MODPERL_preconfig
 .  if ${CONFIGURE_STYLE:L:Mmodinst}
 BUILD_DEPENDS +=   devel/p5-Module-Install
 CONFIGURE_ARGS +=  --skipdeps
-_MODPERL_preconfig = rm -rf ${WRKSRC}/inc/Module/*Install*
+_MODPERL_preconfig = rm -rf ${WRKSRC}/inc/*
 .  else
 _MODPERL_preconfig = :
 .  endif

Then that needs going back over ports and adding in missing
p5-Module-Install-x to replace old untested bundled versions in the
dist files. Have all the updates to go with that.

The other thing to note, is the smaller set of ports runtime/buildtime
required. Because they are only recommendations and not used.

I check over things, and I did mine months ago, and based on an update
to 1.16 long before that. Might have missed some things, and need will
recheck. But I have been running all my dpb runs with the changes in
place, what I have works with dpb, also works with last build tests I
did - for each perl package with just build packages installed, and
ensure it builds.

On 11/03/17 16:05, Alexander Bluhm wrote:
> On Fri, Nov 03, 2017 at 03:08:11PM +0000, Nigel Taylor wrote:
>> Can't respond quickly to this, this is my version, and has been run
>> through earlier version 1.16 etc,
> 
> Does that mean that you want to take care of the update?
> 
>> the full update requires complex
>> p5-Module-Install- updates
> 
> I have not seen any fallout with the existing p5-Module-Install-
> modules.  Do you have anything that got broken?  Can we update
> p5-Module-Install and fix everything afterwards?
> 
>> +TEST_DEPENDS +=devel/p5-Module-Install-AuthorTests \
> 
> I have added p5-Module-Install-AuthorTests so that the test is not
> skipped.
> 
>> +   devel/p5-Module-Install-ExtraTests
> 
> This port p5-Module-Install-ExtraTests does not exist yet.  I ignore
> the dependency, it just means that a test is skipped.
> 
>> -# for the CPAN regression test
>> -pre-test:
>> -   mkdir -p ${WRKDIR}/home
>> -PORTHOME=  ${WRKDIR}/home
> 
> I did not find why this is needed so I removed it.
> 
>> +# No autoinstall from CPAN...
>> +CONFIGURE_ARGS=--skipdeps
> 
> I see that lib/Module/AutoInstall.pm checks it, so I put it back.
> 
>>  MAKE_ENV=  TEST_POD=Yes
> 
> I do not see why this is needed, so I removed it.
> 
>> +post-patch:
>> +   find ${WRKSRC} -type f -name "*.orig" -exec rm {} +
> 
> This prevents make update-patches, so I do not include it.
> 
> New diff, ok?
> 
> bluhm
> 
> Index: devel/p5-Module-Install/Makefile
> ===
> RCS file: /data/mirror/openbsd/cvs/ports/devel/p5-Module-Install/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- devel/p5-Module-Install/Makefile  9 Jan 2017 11:06:45 -   1.25
> +++ devel/p5-Module-Install/Makefile  3 Nov 2017 15:54:58 -
> @@ -4,29 +4,29 @@ COMMENT=standalone extensible Perl modu
>  
>  MODULES= cpan
>  PKG_ARCH=*
> -DISTNAME=Module-Install-1.08
> -REVISION=3
> +DISTNAME =   Module-Install-1.18
>  CATEGORIES=  devel
>  
> +MAINTAINER = Alexander Bluhm <bl...@openbsd.org>
> +
>  # perl
>  PERMIT_PACKAGE_CDROM=Yes
>  
> -RUN_DEPENDS+=devel/p5-Module-ScanDeps>=1.13 \
> - devel/p5-File-Remove \
> - devel/p5-PAR-Dist \
> - devel/p5-YAML-Tiny>=1.38 \
> - converters/p5-JSON
> +BUILD_DEPENDS =  devel/p5-YAML-Tiny>=1.33
> +RUN_DEPENDS =archivers/p5-Archive-Zip>=1.37 \
> + converters/p5-JSON>=2.9 \
> + devel/p5-File-HomeDir>=1 \
> + devel/p5-File-Remove>=1.42 \
> + devel/p5-Module-Build>=0.29 \
> + devel/p5-Module-ScanDeps>=1.09 \
> + devel/p5-PAR-Dist>=0.29 \
> + devel/p5-YAML-Tiny>=1.38

Re: security/gpgme (needs help)

2017-11-03 Thread Nigel Taylor
As you say it's not a FLAVOR what's this in the Makefile for

-CONFIGURE_STYLE=   gnu
+MULTI_PACKAGES =   -main -qt -py2 -py3
+PSEUDO_FLAVORS =   no_qt no_py2 no_py3
+FLAVOR ?=

As subpackage is even worse so even the simplest ports using gpgme needs
Qt5 built to build.

On 11/03/17 15:39, Jeremie Courreges-Anglas wrote:
> On Thu, Nov 02 2017, Nigel Taylor <njtaylor0...@btinternet.com> wrote:
>> Should you promote gpgme-qt to be the default flavor over others
> 
> It's a subpackage, not a flavor.
> 
>> FLAVOR ?=
>>
>> should default to no_qt no_python2 no_python3, that is the default as
>> before. Building with qt should be an extra, in fact use of this sort of
>> complex PSEUDO_FLAVOR causes problems especially with something as large
>> as qt5, which means dpb can't be used for build a subset of packages.
>>
>> I dpb tries to build security/gpgme,no_qt,no_py2,no_py3,-main as
>> effectively used by all current ports using gpgme which would have to be
>> changed in the ports tree.
>>
>> The existing dpb xxx/yyy or list that built a subset of packages, this
>> change on seeing reference to security/gpgme will build not only the
>> packages as before, but all the packages for the included modules, that
>> is python2 and sub packages, python3 and sub packages, and the whole of qt5.
>>
>> This is enforcing qt5 on those who don't want and don't need qt5.
>>
>> python2 / python3 I can live with. qt5 I can live without.
>>
>> For those wanting a small light weight system, qt5 - everywhere -
>> everything just isn't what they want.
> 
> This is not about qt5 everywhere, this about qt5 on the build machine;
> remember that the ports tree is optimized for bulk builds.
> 
> I'm *much more* concerned about introducing a hard dep on a C++11
> compiler (and Qt5?) on such an important library.
> 
>> Just why should if we want a small light weight system should we need to
>> go around adding in no_qt,no_py2,no_py3,-main to everything? Maybe here
>> also there would be less objections on my part if dpb didn't try to
>> build every possible flavor, until it does. I suggest using a separate
>> security/qt-gpgme and security/gpgme
> 
> This may be a good idea.
> 
>> also strictly python2 and python3 flavor should default to no_qt rather
>> than with qt5. The main choice for python isn't qt5 it's Tk, and a Tk
>> flavor of gpgme would tie in with the use of python2/3.
> 
> I don't understand the link between the possible -python* *subpackages*
> and qt5.  Of course those subpackages shouldn't depend on Qt.  We're
> talking about optional subpackages here, not package flavors.
> 
>> Littering qt5 around just about everything is bad as is the whole qt
>> mind set of having to put anything and everything into it's own wrappers.
>>
>> On 11/01/17 16:53, Rafael Sadowski wrote:
>>> Hi porters,
>>>
>>> I need help with the gpgme update. Special thing here, I need the Qt
>>> bindings because kde-applications/gpgmepp is dead and all dependent
>>> programs work with gpgme-qt now.
>>>
>>> But I always trap into the following link issue:
>>>
>>> libtool: link: cc -shared -fPIC -DPIC -o
>>> .libs/libgpgme.so.20.0 -I/usr/local/include -O2 -pipe -Wall -Wcast-align 
>>> -Wshadow -Wstrict-prototypes
>>> .libs/conversion.o .libs/b64dec.o .libs/get-env.o .libs/parsetlv.o
>>> .libs/mbox-util.o .libs/data.o .libs/data-fd.o .libs/data-stream.o
>>> .libs/data-mem.o .libs/data-user.o .libs/data-compat.o
>>> .libs/data-identify.o .libs/signers.o .libs/sig-notation.o
>>> .libs/wait.o .libs/wait-global.o .libs/wait-private.o
>>> .libs/wait-user.o .libs/op-support.o .libs/encrypt.o
>>> .libs/encrypt-sign.o .libs/decrypt.o .libs/decrypt-verify.o
>>> .libs/verify.o .libs/sign.o .libs/passphrase.o .libs/progress.o
>>> .libs/key.o .libs/keylist.o .libs/keysign.o .libs/trust-item.o
>>> .libs/trustlist.o .libs/tofupolicy.o .libs/import.o .libs/export.o
>>> .libs/genkey.o .libs/delete.o .libs/edit.o .libs/getauditlog.o
>>> .libs/opassuan.o .libs/passwd.o .libs/spawn.o .libs/assuan-support.o
>>> .libs/engine.o .libs/engine-gpg.o .libs/status-table.o
>>> .libs/engine-gpgsm.o .libs/engine-assuan.o .libs/engine-gpgconf.o
>>> .libs/engine-uiserver.o .libs/engine-g13.o .libs/vfs-mount.o
>>> .libs/vfs-create.o .libs/engine-spawn.o .libs/gpgconf.o
>>> .libs/queryswdb.o .libs/posix-util.o .libs/posix-io.o .libs/dirinfo.o
>>> .libs/debug.o .libs/gpgme.o .libs/version.o .libs/error.o
>>> .libs/ath.o -L.libs -lassuan -lg

Re: update devel/p5-Module-Install

2017-11-03 Thread Nigel Taylor
Can't respond quickly to this, this is my version, and has been run
through earlier version 1.16 etc, the full update requires complex
p5-Module-Install- updates


Index: Makefile
===
RCS file: /home/cvs/ports/devel/p5-Module-Install/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile9 Jan 2017 11:06:45 -   1.25
+++ Makefile16 Aug 2017 00:14:44 -
@@ -4,29 +4,36 @@ COMMENT=  standalone extensible Perl modu

 MODULES=   cpan
 PKG_ARCH=  *
-DISTNAME=  Module-Install-1.08
-REVISION=  3
-CATEGORIES=devel
+DISTNAME=  Module-Install-1.18
+CATEGORIES= devel

 # perl
 PERMIT_PACKAGE_CDROM=  Yes

-RUN_DEPENDS+=  devel/p5-Module-ScanDeps>=1.13 \
-   devel/p5-File-Remove \
-   devel/p5-PAR-Dist \
-   devel/p5-YAML-Tiny>=1.38 \
-   converters/p5-JSON
+RUN_DEPENDS=   devel/p5-File-Remove>=1.42 \
+   devel/p5-Module-ScanDeps>=1.13 \
+   devel/p5-YAML-Tiny>=1.38
+
+# recommendations only...
+#  archivers/p5-Archive-Zip>=1.37 \
+#  converters/p5-JSON>=2.90 \
+#  devel/p5-PAR-Dist>=0.29 \
+#  www/p5-libwww>=6.05

 # special case; this is *not* a CONFIGURE_STYLE=modbuild port
 RUN_DEPENDS+=  devel/p5-Module-Build
+BUILD_DEPENDS +=   ${RUN_DEPENDS}

-CONFIGURE_ARGS=--skipdeps
+# Needs building as package first so these can be built...
+TEST_DEPENDS +=devel/p5-Module-Install-AuthorTests \
+   devel/p5-Module-Install-ExtraTests

-# for the CPAN regression test
-pre-test:
-   mkdir -p ${WRKDIR}/home
+# No autoinstall from CPAN...
+CONFIGURE_ARGS=--skipdeps

-PORTHOME=  ${WRKDIR}/home
 MAKE_ENV=  TEST_POD=Yes
+
+post-patch:
+   find ${WRKSRC} -type f -name "*.orig" -exec rm {} +

 .include 
Index: distinfo
===


On 11/03/17 14:47, Alexander Bluhm wrote:
> Hi,
> 
> ok to update p5-Module-Install to 1.18?
> 
> - added myself as maintainer
> - copied warning that this should not used for new modules into DESCR
> - added recomended modules to run dependencies so that we always
>   operate on a fixed set of modules
> - will sort according to Makefile.template later to keep diff small
> 
> bluhm
> 
> Index: devel/p5-Module-Install/Makefile
> ===
> RCS file: /data/mirror/openbsd/cvs/ports/devel/p5-Module-Install/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- devel/p5-Module-Install/Makefile  9 Jan 2017 11:06:45 -   1.25
> +++ devel/p5-Module-Install/Makefile  3 Nov 2017 14:33:57 -
> @@ -4,29 +4,31 @@ COMMENT=standalone extensible Perl modu
>  
>  MODULES= cpan
>  PKG_ARCH=*
> -DISTNAME=Module-Install-1.08
> -REVISION=3
> +DISTNAME =   Module-Install-1.18
>  CATEGORIES=  devel
>  
> +MAINTAINER = Alexander Bluhm 
> +
>  # perl
>  PERMIT_PACKAGE_CDROM=Yes
>  
> -RUN_DEPENDS+=devel/p5-Module-ScanDeps>=1.13 \
> - devel/p5-File-Remove \
> - devel/p5-PAR-Dist \
> - devel/p5-YAML-Tiny>=1.38 \
> - converters/p5-JSON
> +BUILD_DEPENDS =  devel/p5-YAML-Tiny>=1.33
> +RUN_DEPENDS =archivers/p5-Archive-Zip>=1.37 \
> + converters/p5-JSON>=2.9 \
> + devel/p5-File-HomeDir>=1 \
> + devel/p5-File-Remove>=1.42 \
> + devel/p5-Module-Build>=0.29 \
> + devel/p5-Module-ScanDeps>=1.09 \
> + devel/p5-PAR-Dist>=0.29 \
> + devel/p5-YAML-Tiny>=1.38 \
> + www/p5-libwww>=6.05
>  
>  # special case; this is *not* a CONFIGURE_STYLE=modbuild port
> -RUN_DEPENDS+=devel/p5-Module-Build
> -
> -CONFIGURE_ARGS=  --skipdeps
>  
>  # for the CPAN regression test
>  pre-test:
>   mkdir -p ${WRKDIR}/home
>  
>  PORTHOME=${WRKDIR}/home
> -MAKE_ENV=TEST_POD=Yes
>  
>  .include 
> Index: devel/p5-Module-Install/distinfo
> ===
> RCS file: /data/mirror/openbsd/cvs/ports/devel/p5-Module-Install/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- devel/p5-Module-Install/distinfo  19 Mar 2014 09:07:26 -  1.7
> +++ devel/p5-Module-Install/distinfo  3 Nov 2017 14:24:49 -
> @@ -1,2 +1,2 @@
> -SHA256 (Module-Install-1.08.tar.gz) = 
> 7YZ4KSkgjmOjVwmtb1Pt054QX8G8t9z8P7c2KvZ7tRQ=
> -SIZE (Module-Install-1.08.tar.gz) = 126800
> +SHA256 (Module-Install-1.18.tar.gz) = 
> KQaKwzUCzslZhEwgZRbAnMSoR8tXMn1BAV9gUVPKZF4=
> +SIZE (Module-Install-1.18.tar.gz) = 114751
> Index: 
> devel/p5-Module-Install/patches/patch-lib_Module_Install_Admin_Include_pm
> 

Re: security/gpgme (needs help)

2017-11-02 Thread Nigel Taylor
Should you promote gpgme-qt to be the default flavor over others

FLAVOR ?=

should default to no_qt no_python2 no_python3, that is the default as
before. Building with qt should be an extra, in fact use of this sort of
complex PSEUDO_FLAVOR causes problems especially with something as large
as qt5, which means dpb can't be used for build a subset of packages.

I dpb tries to build security/gpgme,no_qt,no_py2,no_py3,-main as
effectively used by all current ports using gpgme which would have to be
changed in the ports tree.

The existing dpb xxx/yyy or list that built a subset of packages, this
change on seeing reference to security/gpgme will build not only the
packages as before, but all the packages for the included modules, that
is python2 and sub packages, python3 and sub packages, and the whole of qt5.

This is enforcing qt5 on those who don't want and don't need qt5.

python2 / python3 I can live with. qt5 I can live without.

For those wanting a small light weight system, qt5 - everywhere -
everything just isn't what they want.

Just why should if we want a small light weight system should we need to
go around adding in no_qt,no_py2,no_py3,-main to everything? Maybe here
also there would be less objections on my part if dpb didn't try to
build every possible flavor, until it does. I suggest using a separate
security/qt-gpgme and security/gpgme

also strictly python2 and python3 flavor should default to no_qt rather
than with qt5. The main choice for python isn't qt5 it's Tk, and a Tk
flavor of gpgme would tie in with the use of python2/3.

Littering qt5 around just about everything is bad as is the whole qt
mind set of having to put anything and everything into it's own wrappers.



On 11/01/17 16:53, Rafael Sadowski wrote:
> Hi porters,
> 
> I need help with the gpgme update. Special thing here, I need the Qt
> bindings because kde-applications/gpgmepp is dead and all dependent
> programs work with gpgme-qt now.
> 
> But I always trap into the following link issue:
> 
> libtool: link: cc -shared -fPIC -DPIC -o .libs/libgpgme.so.20.0 
> -I/usr/local/include -O2 -pipe -Wall -Wcast-align -Wshadow 
> -Wstrict-prototypes .libs/conversion.o .libs/b64dec.o .libs/get-env.o 
> .libs/parsetlv.o .libs/mbox-util.o .libs/data.o .libs/data-fd.o 
> .libs/data-stream.o .libs/data-mem.o .libs/data-user.o .libs/data-compat.o 
> .libs/data-identify.o .libs/signers.o .libs/sig-notation.o .libs/wait.o 
> .libs/wait-global.o .libs/wait-private.o .libs/wait-user.o .libs/op-support.o 
> .libs/encrypt.o .libs/encrypt-sign.o .libs/decrypt.o .libs/decrypt-verify.o 
> .libs/verify.o .libs/sign.o .libs/passphrase.o .libs/progress.o .libs/key.o 
> .libs/keylist.o .libs/keysign.o .libs/trust-item.o .libs/trustlist.o 
> .libs/tofupolicy.o .libs/import.o .libs/export.o .libs/genkey.o 
> .libs/delete.o .libs/edit.o .libs/getauditlog.o .libs/opassuan.o 
> .libs/passwd.o .libs/spawn.o .libs/assuan-support.o .libs/engine.o 
> .libs/engine-gpg.o .libs/status-table.o .libs/engine-gpgsm.o 
> .libs/engine-assuan.o .libs/engine-gpgconf.o .libs/engine-uiserver.o 
> .libs/engine-g13.o .libs/vfs-mount.o .libs/vfs-create.o .libs/engine-spawn.o 
> .libs/gpgconf.o .libs/queryswdb.o .libs/posix-util.o .libs/posix-io.o 
> .libs/dirinfo.o .libs/debug.o .libs/gpgme.o .libs/version.o .libs/error.o 
> .libs/ath.o -L.libs -lassuan -lgpg-error -lintl -liconv
> libtool: link: ar cru .libs/libgpgme.a conversion.o b64dec.o get-env.o 
> parsetlv.o mbox-util.o data.o data-fd.o data-stream.o data-mem.o data-user.o 
> data-compat.o data-identify.o signers.o sig-notation.o wait.o wait-global.o 
> wait-private.o wait-user.o op-support.o encrypt.o encrypt-sign.o decrypt.o 
> decrypt-verify.o verify.o sign.o passphrase.o progress.o key.o keylist.o 
> keysign.o trust-item.o trustlist.o tofupolicy.o import.o export.o genkey.o 
> delete.o edit.o getauditlog.o opassuan.o passwd.o spawn.o assuan-support.o 
> engine.o engine-gpg.o status-table.o engine-gpgsm.o engine-assuan.o 
> engine-gpgconf.o engine-uiserver.o engine-g13.o vfs-mount.o vfs-create.o 
> engine-spawn.o gpgconf.o queryswdb.o posix-util.o posix-io.o dirinfo.o 
> debug.o gpgme.o version.o error.o ath.o
> libtool: link: ranlib .libs/libgpgme.a
> cc -DHAVE_CONFIG_H -I. -I..   -I/usr/local/include -I/usr/local/include  -O2 
> -pipe -Wall -Wcast-align -Wshadow -Wstrict-prototypes -MT gpgme-tool.o -MD 
> -MP -MF .deps/gpgme-tool.Tpo -c -o gpgme-tool.o gpgme-tool.c
> mv -f .deps/gpgme-tool.Tpo .deps/gpgme-tool.Po
> cc -DHAVE_CONFIG_H -I. -I..   -I/usr/local/include -I/usr/local/include  -O2 
> -pipe -Wall -Wcast-align -Wshadow -Wstrict-prototypes -MT argparse.o -MD -MP 
> -MF .deps/argparse.Tpo -c -o argparse.o argparse.c   
> mv -f .deps/argparse.Tpo .deps/argparse.Po
> c++ gpgme-tool.o argparse.o libgpgme.la -lassuan -L/usr/local/lib -lgpg-error
> libgpgme.la: file not recognized: File format not recognized
> c++: error: linker command failed with exit code 1 (use -v to see invocation)
> 
> Help, Feedback 

Re: [UPDATE] sysutils/sleuthkit

2017-10-31 Thread nigel
On 10/31/17 15:47, Remi Pointel wrote:
> Hi,
> 
> this is the diff to update sleuthkit to latest release.
> 
> Ok?
> 
> Cheers,
> 
> Remi.
Did you base this on my update sent to ports@ below

Look like a no, naddy@ complained about the version 4.3.0
not using gnu CONFIGURE_STYLE, sthen@ suggested shared library 
version should be updated, and not sure without checking 4.5.0 
but I found sqlite3 was needed. Also dropped using cppunit.

diff -u -p -r1.21 Makefile
--- Makefile26 Jul 2017 22:45:30 -  1.21
+++ Makefile7 Sep 2017 21:13:24 -
@@ -2,11 +2,10 @@
 
 COMMENT=   forensic toolkit based on TCT
 
-DISTNAME=  sleuthkit-4.3.0
+DISTNAME=  sleuthkit-4.4.2
 CATEGORIES=sysutils security
-REVISION=  0
 
-SHARED_LIBS += tsk 0.0 # 14.0
+SHARED_LIBS += tsk 1.0 # 16.1
 
 HOMEPAGE=  http://www.sleuthkit.org/
 
@@ -18,17 +17,19 @@ PERMIT_PACKAGE_FTP= Yes
 
 MASTER_SITES = 
https://github.com/sleuthkit/sleuthkit/releases/download/${DISTNAME}/
 
-WANTLIB += c m pthread ${COMPILER_LIBCXX} z
+WANTLIB += c m pthread ${COMPILER_LIBCXX} sqlite3 z
 
-CONFIGURE_STYLE =  simple
+CONFIGURE_STYLE =  gnu
 
 CONFIGURE_ARGS +=  --mandir='${PREFIX}/man' \
--disable-java \
--without-afflib \
--without-libewf
 
-BUILD_DEPENDS= devel/cppunit
+CONFIGURE_ENV =ac_cv_path_CPPUNIT_CONFIG=no
+
 RUN_DEPENDS=   converters/p5-DateManip
+LIB_DEPENDS =  databases/sqlite3
 
 NO_TEST =  Yes
 



Re: [UPDATE] sysutils/sleuthkit

2017-10-31 Thread nigel
On 10/31/17 15:47, Remi Pointel wrote:
> Hi,
> 
> this is the diff to update sleuthkit to latest release.
> 
> Ok?
> 
> Cheers,
> 
> Remi.

ccpunit - just reminded myself, I removed as used for testing, and
Makefile has NO_TEST=yes, testing has to be done manually.

Thanks, and Ok



CVS: cvs.openbsd.org: ports

2017-10-26 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2017/10/26 13:56:17

Modified files:
multimedia/get_iplayer: Makefile distinfo 

Log message:
Update to version 3.06 unbreak tv cache after
site format changes.

Ok sthen@



Re: NEW: x11/qdirstat (KDE3 x11/kdirstat replacement)

2017-10-26 Thread Nigel Taylor
On 10/26/17 13:10, Rafael Sadowski wrote:
> Hi All,
> 
> Here is a replacement for x11/kdirstat (KDE3).
> 
> Added the following pkgpath/conflict in PLIST:
>  @pkgpath x11/kdirstat
>  @conflict kdirstat-*
> 
> make update works fine here:
> 
> kdirstat-2.4.0p14->qdirstat-1.4: ok
> 
> As always, tested on amd64.
> 
> Ok to remove kdirstat and add qdirstat? Comments?
> 
>>From DESCR:
> QDirStat is a graphical application to show where your disk space has gone and
> to help you to clean it up.
> 
> This is a Qt-only port of the old Qt3/KDE3-based KDirStat.
> 
kdirstat is maintained as part of the TDE fork, as is much of KDE3.

You will find most of kde3 current updates under here, for anyone looking.

http://mirror.git.trinitydesktop.org/cgit/

Log for kdirstat ...

Commit message (Expand) Author  Age Files   Lines
*   Reset submodule main/applications/kdirstat/cmake to latest 
HEADHEADmaster   Automated System2017-03-26  1   -0/+0

*   Reset submodule main/applications/kdirstat/cmake to latest HEAD 
Automated System2017-02-18  1   -0/+0

*   Reset submodule main/applications/kdirstat/cmake to latest HEAD 
Automated System2017-01-29  1   -0/+0

*   cmake: add tde_add_check_executable macro   Slávek Banko
2017-01-25  1   -0/+0

*   Reset submodule main/applications/kdirstat/admin to latest HEAD 
Automated System2016-08-07  1   -0/+0

*   Fix invalid headers in PNG files and optimize for size  Timothy Pearson 
2016-07-23  12  -0/+0

*   Reset submodule main/applications/kdirstat/cmake to latest HEAD 
Automated System2016-04-19  1   -0/+0

*   Reset submodule main/applications/kdirstat/cmake to latest HEAD 
Automated System2016-03-17  1   -0/+0

*   Update version number to R14.1.0Michele Calgaro 2015-07-12  
1   -1/+1

*   Reset submodule main/applications/kdirstat/cmake to latest HEAD Slávek 
Banko2015-05-31  1   -0/+0

*   Reset submodule main/applications/kdirstat/cmake to latest HEAD Slávek 
Banko2015-04-17  1   -0/+0

*   Reset submodule main/applications/kdirstat/admin to latest HEAD Slávek 
Banko2015-04-17  1   -0/+0

*   Fix incorrectly renamed strings Slávek Banko2015-03-05  1   
-1/+1

*   Rename most device icons to comply with XDG standards   Timothy Pearson 
2015-03-02  2   -2/+2

*   Reset submodule main/applications/kdirstat/admin to latest HEADr14.0.0  
Automated System2014-10-20  1   -0/+0

*   Reset submodule main/applications/kdirstat/cmake to latest HEAD 
Automated System2014-10-14  1   -0/+0

*   Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kdirstat 
Timothy Pearson 2014-10-14  1   -0/+0
|\  
| * Reset submodule main/applications/kdirstat/cmake to latest HEAD 
Automated System2014-10-13  1   -0/+0

* | Bring mail_forward, mail_new, mail_replyall, mail_reply, mail_send, 
player_pa...Timothy Pearson 2014-10-14  1   -2/+2
|/  
*   Bring up, down, top, and bottom icons into XDG compliance   Timothy 
Pearson 2014-10-13  1   -1/+1

*   Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kdirstat 
Timothy Pearson 2014-10-12  1   -0/+0
|\  
| * Reset submodule main/applications/kdirstat/cmake to latest HEAD 
Automated System2014-10-12  1   -0/+0

* | Bring stop, lock, exit, and run icons into XDG compliance   Timothy 
Pearson 2014-10-12  2   -2/+2



Re: i386 ports build failures

2017-10-11 Thread Nigel Taylor
On 10/11/17 11:17, Stuart Henderson wrote:
> devel/cryptopp
> lang/STk
> lang/gforth
> lang/kawa
> sysutils/grub
> x11/p5-Wx
> 
> 
> 

> 
>> == ./lang/kawa.log
> 
> ===>  Building for kawa-2.4
>  cd . && /usr/local/bin/automake-1.15 --foreign
> configure.ac:8: error: version mismatch.  This is Automake 1.15.1,
> configure.ac:8: but the definition used by this AM_INIT_AUTOMAKE
> configure.ac:8: comes from Automake 1.15.  You should recreate
> configure.ac:8: aclocal.m4 with aclocal and run automake again.
> gmake: *** [Makefile:1359: Makefile.in] Error 1
> *** Error 2 in lang/kawa (/usr/ports/infrastructure/mk/bsd.port.mk:2728 
> '/usr/obj/ports/kawa-2.4/.build_done')
> *** Error 1 in lang/kawa (/usr/ports/infrastructure/mk/bsd.port.mk:2425 
> 'build')
> 
> 
There was an update to kawa-3.0 sent to @ports.

Includes the fix I sent around for the above.



Re: [update] kawa-3.0

2017-10-05 Thread Nigel Taylor
This need fixing to stop random build failures.

forwarding my e-mail sent for 2.4 with details...

On 10/05/17 20:58, Timo Myyrä wrote:
> Hi,
> 
> Here's an update to kawa 3.0. A lot of patches got upstreamed so zap those.
> Slightly tested on amd64.
> 
> Timo
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/kawa/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- Makefile  19 Sep 2017 19:23:04 -  1.15
> +++ Makefile  5 Oct 2017 05:14:55 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= Scheme and language framework for the Java platform
>  
> -DISTNAME=kawa-2.4
> +DISTNAME=kawa-3.0
>  CATEGORIES=  lang java
>  
>  HOMEPAGE=https://www.gnu.org/software/kawa/
> Index: distinfo
> ===
> RCS file: /cvs/ports/lang/kawa/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo  31 Aug 2017 06:33:05 -  1.4
> +++ distinfo  5 Oct 2017 05:14:55 -
> @@ -1,2 +1,2 @@
> -SHA256 (kawa-2.4.tar.gz) = FMCL6BYxoeuLiSbKI1GYyhZRVsDBeey+boONP0tHY10=
> -SIZE (kawa-2.4.tar.gz) = 3285436
> +SHA256 (kawa-3.0.tar.gz) = Hm6FIXvW2MKgw0eIgqRXAxTfa5UHj+exIlkRw5q/OM0=
> +SIZE (kawa-3.0.tar.gz) = 3393879
> Index: patches/patch-bin_kawa_sh_in
> ===
> RCS file: patches/patch-bin_kawa_sh_in
> diff -N patches/patch-bin_kawa_sh_in
> --- patches/patch-bin_kawa_sh_in  31 Aug 2017 06:33:05 -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,10 +0,0 @@
> -$OpenBSD: patch-bin_kawa_sh_in,v 1.1 2017/08/31 06:33:05 jasper Exp $
>  bin/kawa.sh.in.orig  Sun Apr  9 08:44:21 2017
> -+++ bin/kawa.sh.in   Sun Apr  9 08:44:30 2017
> -@@ -1,5 +1,5 @@
> - #!@KAWA_SHELL@
> --thisfile=`type -p $0`
> -+thisfile=`command -v $0`
> - case "$thisfile" in
> -   "") echo "installation error - can't find path to $0"; exit -1 ;;
> -   /*) ;;
> Index: patches/patch-doc_Makefile_am
> ===
> RCS file: patches/patch-doc_Makefile_am
> diff -N patches/patch-doc_Makefile_am
> --- patches/patch-doc_Makefile_am 31 Aug 2017 06:33:05 -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,19 +0,0 @@
> -$OpenBSD: patch-doc_Makefile_am,v 1.1 2017/08/31 06:33:05 jasper Exp $
>  doc/Makefile.am.orig Sat Mar 25 12:33:43 2017
> -+++ doc/Makefile.am  Sat Mar 25 12:34:24 2017
> -@@ -29,12 +29,11 @@ TEXI2PDF = texi2pdf
> - 
> - man_MANS = kawa.1 qexo.1
> - kawa.1: $(srcdir)/kawa.man
> --nroff -man $(srcdir)/kawa.man > tpm-kawa.1
> --mv tpm-kawa.1 kawa.1
> -+cp $(srcdir)/kawa.man kawa.1
> - 
> -+
> - qexo.1: $(srcdir)/qexo.man
> --nroff -man $(srcdir)/qexo.man > tpm-qexo1
> --mv tpm-qexo1 qexo.1
> -+cp $(srcdir)/qexo.man qexo.1
> - 
> - ../kawa-doc-$(VERSION).tar.gz: kawa.info $(KAWA_HTMLDIR)/index.html kawa.pdf
> - tar cf - $(KAWA_HTMLDIR)/*.html kawa.pdf|gzip -c --best >$@
> Index: patches/patch-gnu_xquery_testsuite_exp-format-users_html
> ===
> RCS file: patches/patch-gnu_xquery_testsuite_exp-format-users_html
> diff -N patches/patch-gnu_xquery_testsuite_exp-format-users_html
> --- patches/patch-gnu_xquery_testsuite_exp-format-users_html  31 Aug 2017 
> 06:33:05 -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-gnu_xquery_testsuite_exp-format-users_html,v 1.1 2017/08/31 
> 06:33:05 jasper Exp $
> -
> -Index: gnu/xquery/testsuite/exp-format-users.html
>  gnu/xquery/testsuite/exp-format-users.html.orig
> -+++ gnu/xquery/testsuite/exp-format-users.html
> -@@ -29,4 +29,4 @@
> - Rip Van Winkle
> - B
> - 
> --
> -+
> -\ No newline at end of file
> Index: patches/patch-gnu_xquery_testsuite_latin1a_expected
> ===
> RCS file: patches/patch-gnu_xquery_testsuite_latin1a_expected
> diff -N patches/patch-gnu_xquery_testsuite_latin1a_expected
> --- patches/patch-gnu_xquery_testsuite_latin1a_expected   31 Aug 2017 
> 06:33:05 -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,9 +0,0 @@
> -$OpenBSD: patch-gnu_xquery_testsuite_latin1a_expected,v 1.1 2017/08/31 
> 06:33:05 jasper Exp $
> -
> -Index: gnu/xquery/testsuite/latin1a.expected
>  gnu/xquery/testsuite/latin1a.expected.orig
> -+++ gnu/xquery/testsuite/latin1a.expected
> -@@ -1 +1 @@
> --Norwegian letters: ae: oe: aa:
> -+Norwegian letters: ae: oe: aa:
> -\ No newline at end of file
> Index: patches/patch-testsuite_Makefile_am
> ===
> RCS file: patches/patch-testsuite_Makefile_am
> diff -N patches/patch-testsuite_Makefile_am
> --- patches/patch-testsuite_Makefile_am   31 Aug 2017 06:33:05 -  
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -

Re: [maintainer update] net/tcpreplay 4.0.5 -> 4.2.6

2017-09-24 Thread Nigel Taylor
On 09/24/17 13:02, Stuart Henderson wrote:
> On 2017/09/23 23:21, Nigel Taylor wrote:
>> Has been moved to github.
>>
>> builds on amd64.
>>
>> Ok?
> 
> GH_* is for autogenerated tarballs, this is a normal uploaded release,
> if you are setting MASTER_SITES manually anyway then GH_* is just extra
> complexity and not useful.
> 
> The autogen build dep has gone away. Replacement makefile diff below
> with those changes, maybe consider EXTRACT_SUFX=.tar.xz as well? (700K
> vs 2.8MB).
> 
> Various security related fixes, not part of big dependency chains,
> so I generally think this should go in.
> 
Bit of a messy one, sure versions were only available from github,
now 4.2.5/4.2.6 are available from sourceforge, so reverted everything
back from github.

Home page still says 4.2.5, and links points to github, but old releases
link is to sourceforge, and includes 4.2.6 and 4.2.5.

Can see a tar.xz on sourceforge but it's hidden, and home page only
lists tar.gz downloads.

Index: Makefile
===
RCS file: /home/cvs/ports/net/tcpreplay/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile	8 May 2017 18:10:25 -	1.38
+++ Makefile	24 Sep 2017 19:09:01 -
@@ -2,11 +2,10 @@
 
 COMMENT=	resend network traffic saved by tcpdump
 
-DISTNAME=	tcpreplay-4.0.5
+DISTNAME=	tcpreplay-4.2.6
 CATEGORIES=	net
-REVISION=	2
 
-HOMEPAGE=	http://tcpreplay.appneta.com/	
+HOMEPAGE=	http://tcpreplay.appneta.com/
 
 MAINTAINER=	Nigel Taylor <ni...@openbsd.org>
 
@@ -20,6 +19,5 @@ WANTLIB=	c dnet>=1
 CONFIGURE_STYLE= gnu
 
 LIB_DEPENDS=	net/libdnet
-BUILD_DEPENDS=	devel/autogen
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/net/tcpreplay/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo	16 Oct 2014 13:00:56 -	1.9
+++ distinfo	29 Aug 2017 21:05:44 -
@@ -1,2 +1,2 @@
-SHA256 (tcpreplay-4.0.5.tar.gz) = Y3mMityeW+eUZ+I1k4OM4OYXslk4z84xFv7aJjA0TYA=
-SIZE (tcpreplay-4.0.5.tar.gz) = 2059744
+SHA256 (tcpreplay-4.2.6.tar.gz) = BDdWxTLauT4r4zpRfvRrE0H3I5J4oQRa5nAEHdikUx0=
+SIZE (tcpreplay-4.2.6.tar.gz) = 3494827
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure	16 Oct 2014 13:43:48 -	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-configure,v 1.4 2014/10/16 13:43:48 nigel Exp $
 configure.orig	Fri Sep  5 17:16:38 2014
-+++ configure	Fri Oct 10 15:21:36 2014
-@@ -18765,7 +18765,7 @@ else
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--[
-+
- #include 
- #include 
- #include 
-@@ -18793,7 +18793,7 @@ main(int argc, char *argv[]) {
- 
- /* else suck, no good */
- exit(-1);
--}]
-+}
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
- 
Index: patches/patch-src_defines_h_in
===
RCS file: patches/patch-src_defines_h_in
diff -N patches/patch-src_defines_h_in
--- patches/patch-src_defines_h_in	6 Jul 2016 10:29:51 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_defines_h_in,v 1.1 2016/07/06 10:29:51 jasper Exp $
-
-CVE-2016-6160
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=829350
-
 src/defines.h.in.orig	Fri May  9 19:28:13 2014
-+++ src/defines.h.in	Wed Jul  6 10:54:28 2016
-@@ -145,7 +145,7 @@ typedef struct tcpr_speed_s {
- #define DEFAULT_MTU 1500/* Max Transmission Unit of standard ethernet
-  * don't forget *frames* are MTU + L2 header! */
- 
--#define MAXPACKET 65535 /* was 16436 linux loopback, but maybe something is bigger then
-+#define MAXPACKET 65549 /* was 16436 linux loopback, but maybe something is bigger then
-linux loopback */
- 
- #define MAX_SNAPLEN 65535   /* tell libpcap to capture the entire packet */
Index: patches/patch-src_tcprewrite_c
===
RCS file: patches/patch-src_tcprewrite_c
diff -N patches/patch-src_tcprewrite_c
--- patches/patch-src_tcprewrite_c	6 Jul 2016 10:29:51 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_tcprewrite_c,v 1.1 2016/07/06 10:29:51 jasper Exp $
-
-CVE-2016-6160
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=829350
-
 src/tcprewrite.c.orig	Fri May  9 19:28:13 2014
-+++ src/tcprewrite.c	Wed Jul  6 10:54:06 2016
-@@ -250,6 +250,8 @@ rewrite_packets(tcpedit_t *tcpedit, pcap_t *pin, pcap_
- packetnum++;
- dbgx(2, "packet " COUNTER_SPEC " caplen %d", packetnum, pkthdr.caplen);
- 
-+if (pkthdr.caplen > MAXPACKET)
-+errx(-1, "F

Re: [update] www/p5-libwww 6.15 -> 6.26

2017-09-24 Thread Nigel Taylor
On 09/24/17 12:49, Stuart Henderson wrote:
> On 2017/09/23 23:21, Nigel Taylor wrote:
>> This has been taken over by new CPAN author.
>>
>> Changes most code cleanup and bug fixes.
>>
>> Built tested on amd64.
>>
>> Used with get_iplayer/get_flash_videos for some time on main desktop.
>>
>> Ok?
> 
> I don't see any problem with the diff itself, but it's the wrong time to
> update a module affecting ~100 ports (not helped by being an interpreted
> language so problems in p5-* often don't show up until runtime).
> 
> So, OK for after unlock.
> 
> 
Anyway version 6.27 is now out. I've moved on to that now.

Built and tested on amd64.

Change history for libwww-perl

6.27  2017-09-21
- Switch to Getopt::Long in lwp-download (GH #262)
- Fix lwp-request -C (GH #261)
- Hide LWP::Protocol::http::Socket,
LWP::Protocol::http::SocketMethods and
  LWP::Debug::TraceHTTP::Socket from PAUSE
- Add tests for the "get" & "head" functions (GH #252)
- Update lwpcook.pod (GH #256)
- Handle undefined values in ->credentials (GH #157)
- Fix lwp-mirror options checks.
- Update bin/ scripts to use $LWP::VERSION instead of ->Version()
- Improve lwp-download --help (GH #262)

6.26  2017-04-12
- Perltidy all apps in the bin/ directory
- Make all apps in bin/ use strict and warnings (RT #92633)
- Fix bug tracker URL in metadata

6.25  2017-04-03
- Fix LWP::UserAgent docs for request and request_simple that pointed to
  functions in LWP::Simple rather than LWP::UserAgent
- Moved the official bug tracker to GitHub rather than RT.

6.24  2017-03-14
- Document clone methods inability to clone cookie jars (RT #13542)
- It is now possible to set the proxy and no_proxy attributes from the
  constructor of LWP::UserAgent. (GH #124)

6.23  2017-03-06
- Fix bug where Protocol::NNTP called undef on a variable before
being done
  using it. (GH PR #121)
- Ran perltidy on LWP::Protocol::NNTP
- Re-organized current documentation set.

6.22  2017-03-01
- Update Travis-CI to test on minimum versions of prereqs. (GH PR #109)
- Fix tests that depended on a newer version of HTTP::Message (GH PR
#119)
- Update documentation to reflect behavior difference in ->put()
depending
  on the version of HTTP::Message installed. (GH PR #120)

6.21  2017-02-21
- Ensure that LWP::Simple re-exports some HTTP::Status functions

6.20  2017-02-21
- Converted to use Dist::Zilla
- Moved several tests to xt/author

6.192017-02-14
- Call HTTP::Status constant functions without & (GH#110)
- Make bin scripts use LWP's version and not maintain their own (PR #54)
- Fix bug triggered in some cases of auth challenges not having a viable
  protocol (PR#111)
- Remove usage of the 'vars' pragma (GH#113)

6.182017-02-03
- Update "timeout" when reusing sockets (PR#90)
- Fix bug triggered when calling simple_request() with a malformed URL
  (PR#108)

6.172017-01-31
- Noted another protocol failure message (PR#65)
- Removed old use of UNIVERSAL::isa() and swapped evals for
Try::Tiny (PR#105)
- Standardized the Changes file (GH#106)
- Fixed documentation error in lwp-request.

6.162017-01-18
- Moved LWP::Protocol::GHTTP into its own dist and removed from here
(PR#81)
- Updated test suite to use strict/warnings and Test::More (PR#88)
- Additional tests for UserAgent coverage (PR#79)
- Cleaned up documentation formatting and fixed several typos
(PR#87, PR#93)
- Stop promoting use of HTTP::Cookies and instead use
HTTP::CookieJar::LWP (PR#102)
- Added some new documentation to UserAgent and tutorial (PR#68)
- Allow default header to carry over when using ->post() in UA (PR#100)
Index: Makefile
===
RCS file: /home/cvs/ports/www/p5-libwww/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile	20 Mar 2016 19:57:23 -	1.43
+++ Makefile	24 Sep 2017 12:50:24 -
@@ -2,16 +2,18 @@
 
 COMMENT=	library for WWW access in Perl
 
-MODULES=	cpan
-PKG_ARCH=	*
-DISTNAME=	libwww-perl-6.15
+DISTNAME=	libwww-perl-6.27
 PKGNAME=	p5-${DISTNAME:S/-perl-/-/}
 CATEGORIES=	www
 
 # Perl
 PERMIT_PACKAGE_CDROM=	Yes
 
+MODULES=	cpan
+CPAN_AUTHOR=	OALDERS
+
 RUN_DEPENDS=	devel/p5-File-Listing>=6.0 \
+		devel/p5-Try-Tiny \
 		textproc/p5-Encode-Locale \
 		net/p5-Net-HTTP>=6.07 \
 		www/p5-HTML-Parser>=3.33 \
@@ -24,8 +26,9 @@ RUN_DEPENDS=	devel/p5-File-Listing>=6.0 
 		www/p5-URI>1.10 \
 		www/p5-WWW-RobotRules>=6.0
 
-BUILD_DEPENDS=	${RUN_DEPENDS}
-CPAN_AUTHOR=	ETHER
+TEST_DEPENDS =	devel/p5-Test-Fatal \
+		devel/p5-Test-RequiresInternet
 
+PKG_ARCH=	*
 
 .include 
Index: distinfo
=

CVS: cvs.openbsd.org: ports

2017-09-24 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2017/09/24 08:54:17

Modified files:
multimedia/get_flash_videos: Makefile distinfo 

Log message:
Update to latest version. Use sthen@ suggestions for Makefile.

Ok sthen@



CVS: cvs.openbsd.org: ports

2017-09-24 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2017/09/24 04:54:23

Modified files:
textproc/p5-Pod-Spell: Makefile 
textproc/p5-Pod-Spell/pkg: PLIST 

Log message:
Add p5-Path-Tiny runtime dependency, adjust PLIST

Ok sthen@



Re: sysutils/sleuthkit: why CONFIGURE_STYLE=simple?

2017-09-23 Thread Nigel Taylor
On 09/08/17 00:13, ni...@openbsd.org wrote:
> On 09/07/17 21:38, Stuart Henderson wrote:
>> On 2017/09/07 19:45, ni...@openbsd.org wrote:
>>>
>>> Attached update to version 4.4.2
>>>
>>> Switch CONFIGURE_STYLE = gnu, to stop some bulk build failures.
>>> Remove need for cppunit.
>>>
>>> Builds on amd64.
>>>
>>> Ok?
>>
>> I can't really comment on the sleuthkit update itself (did you check if
>> a library bump is needed?), but the autoconf bits are ok with me.
>>
>>
> 
> added functions to library, major version change in log. So bumped library.
> 
Ping



[maintainer update] net/socat 1.7.3.1 -> 1.7.3.2

2017-09-23 Thread Nigel Taylor
Minor update bug fixes, some patches now incorporated upstream.

Builds on amd64.

Ok?
Index: Makefile
===
RCS file: /home/cvs/ports/net/socat/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile	2 Feb 2016 10:40:32 -	1.20
+++ Makefile	29 Mar 2017 20:31:40 -
@@ -2,7 +2,7 @@
 
 COMMENT=	relay for bidirectional data transfer
 
-DISTNAME=	socat-1.7.3.1
+DISTNAME=	socat-1.7.3.2
 CATEGORIES=	net
 
 HOMEPAGE=	http://www.dest-unreach.org/socat/
Index: distinfo
===
RCS file: /home/cvs/ports/net/socat/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo	2 Feb 2016 10:40:32 -	1.14
+++ distinfo	29 Mar 2017 20:31:46 -
@@ -1,2 +1,2 @@
-SHA256 (socat-1.7.3.1.tar.gz) = qMsHsSvNBMmPT/wcaLeVR/XdTiPdzLEylA9tVVZcf3k=
-SIZE (socat-1.7.3.1.tar.gz) = 606049
+SHA256 (socat-1.7.3.2.tar.gz) = zj78F+PlRIduvOfNbIWzwnn9oFeyhX/Kr2e5q4va8DQ=
+SIZE (socat-1.7.3.2.tar.gz) = 611707
Index: patches/patch-doc_socat_1
===
RCS file: /home/cvs/ports/net/socat/patches/patch-doc_socat_1,v
retrieving revision 1.7
diff -u -p -r1.7 patch-doc_socat_1
--- patches/patch-doc_socat_1	13 Apr 2015 14:43:28 -	1.7
+++ patches/patch-doc_socat_1	29 Aug 2017 20:52:00 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-doc_socat_1,v 1.7 2015/04/13 14:43:28 jasper Exp $
 doc/socat.1.orig	Sat Jan 24 17:30:52 2015
-+++ doc/socat.1	Mon Apr 13 14:58:09 2015
-@@ -2904,10 +2904,6 @@ in this file\&.
+--- doc/socat.1.orig	Sun Jan 22 18:35:15 2017
 doc/socat.1	Wed Mar 29 21:56:32 2017
+@@ -2905,10 +2905,6 @@ in this file\&.
  Specifies the directory with the trusted (root) certificates\&. The directory
  must contain certificates in PEM format and their hashes (see OpenSSL
  documentation) 
@@ -12,7 +12,7 @@ $OpenBSD: patch-doc_socat_1,v 1.7 2015/0
  .IP "\fB\f(CWpseudo\fP\fP"
  On systems where openssl cannot find an entropy source and where no entropy
  gathering daemon can be utilized, this option activates a mechanism for
-@@ -3397,11 +3393,11 @@ connection, invokes a shell\&. This shell has its stdi
+@@ -3398,11 +3394,11 @@ connection, invokes a shell\&. This shell has its stdi
  connected to the TCP socket (nofork)\&.  The shell starts filan and lets it print the socket addresses to
  stderr (your terminal window)\&.
  .IP 
@@ -26,7 +26,7 @@ $OpenBSD: patch-doc_socat_1,v 1.7 2015/0
  to make the squid executable from Cygwin run under Windows, actual per May 2004)\&.
  .IP 
  .IP "\fB\f(CWsocat \- tcp:www\&.blackhat\&.org:31337,readbytes=1000\fP\fP"
-@@ -3524,11 +3520,11 @@ error\&. 
+@@ -3525,11 +3521,11 @@ error\&. 
  .SH "FILES"
  
  .PP 
Index: patches/patch-doc_socat_html
===
RCS file: /home/cvs/ports/net/socat/patches/patch-doc_socat_html,v
retrieving revision 1.2
diff -u -p -r1.2 patch-doc_socat_html
--- patches/patch-doc_socat_html	13 Apr 2015 14:43:28 -	1.2
+++ patches/patch-doc_socat_html	29 Aug 2017 20:53:53 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-doc_socat_html,v 1.2 2015/04/13 14:43:28 jasper Exp $
 doc/socat.html.orig	Sat Jan 24 17:31:04 2015
-+++ doc/socat.html	Mon Apr 13 14:58:09 2015
-@@ -2781,10 +2781,6 @@ These options apply to the pseudo
 On systems where openssl cannot find an entropy source and where no entropy
 gathering daemon can be utilized, this option activates a mechanism for
-@@ -3309,10 +3305,10 @@ connection, invokes a shell. This shell has its stdin 
+@@ -3310,10 +3306,10 @@ connection, invokes a shell. This shell has its stdin 
  connected to the TCP socket (nofork).  The shell starts filan and lets it print the socket addresses to
  stderr (your terminal window).
  
@@ -25,7 +25,7 @@ $OpenBSD: patch-doc_socat_html,v 1.2 201
  to make the squid executable from Cygwin run under Windows, actual per May 2004).
  
  socat - tcp:www.blackhat.org:31337,readbytes=1000
-@@ -3430,9 +3426,9 @@ error. 
+@@ -3431,9 +3427,9 @@ error. 
  
  FILES
  
Index: patches/patch-sslcls_c
===
RCS file: patches/patch-sslcls_c
diff -N patches/patch-sslcls_c
--- patches/patch-sslcls_c	20 Jul 2015 01:12:09 -	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,53 +0,0 @@
-$OpenBSD: patch-sslcls_c,v 1.4 2015/07/20 01:12:09 jca Exp $
 sslcls.c.orig	Sat Jan 24 03:15:22 2015
-+++ sslcls.c	Sat Jul 18 20:01:59 2015
-@@ -55,6 +55,7 @@ const SSL_METHOD *sycSSLv2_server_method(void) {
- }
- #endif
- 
-+#ifdef HAVE_SSLv3_client_method
- const SSL_METHOD *sycSSLv3_client_method(void) {
-const SSL_METHOD *result;
-Debug("SSLv3_client_method()");
-@@ -62,7 +63,9 @@ const SSL_METHOD *sycSSLv3_client_method(void) {
-Debug1("SSLv3_client_method() -> %p", result);
-return result;
- }
-+#endif
- 
-+#ifdef HAVE_SSLv3_server_method
- const SSL_METHOD 

Re: Maintainer Update multimedia/get_flash_videos 1.25.93 -> 1.25.94

2017-09-23 Thread Nigel Taylor
On 09/07/17 20:34, ni...@openbsd.org wrote:
> On 08/27/17 23:26, ni...@openbsd.org wrote:
>> On 08/23/17 20:21, ni...@openbsd.org wrote:
>>> Update to fix issues 212, 215 and change some old url's.
>>>
>>> Home page changed to github home page.
>>>
>>> Ok?
>>>
>>
>> Ok?
>>
>>
> Ping
> 
> 

Ping



[update] www/p5-libwww 6.15 -> 6.26

2017-09-23 Thread Nigel Taylor
This has been taken over by new CPAN author.

Changes most code cleanup and bug fixes.

Built tested on amd64.

Used with get_iplayer/get_flash_videos for some time on main desktop.

Ok?
Index: Makefile
===
RCS file: /home/cvs/ports/www/p5-libwww/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile	20 Mar 2016 19:57:23 -	1.43
+++ Makefile	18 Sep 2017 11:36:23 -
@@ -2,16 +2,18 @@
 
 COMMENT=	library for WWW access in Perl
 
-MODULES=	cpan
-PKG_ARCH=	*
-DISTNAME=	libwww-perl-6.15
+DISTNAME=	libwww-perl-6.26
 PKGNAME=	p5-${DISTNAME:S/-perl-/-/}
 CATEGORIES=	www
 
 # Perl
 PERMIT_PACKAGE_CDROM=	Yes
 
+MODULES=	cpan
+CPAN_AUTHOR=	OALDERS
+
 RUN_DEPENDS=	devel/p5-File-Listing>=6.0 \
+		devel/p5-Try-Tiny \
 		textproc/p5-Encode-Locale \
 		net/p5-Net-HTTP>=6.07 \
 		www/p5-HTML-Parser>=3.33 \
@@ -24,8 +26,9 @@ RUN_DEPENDS=	devel/p5-File-Listing>=6.0 
 		www/p5-URI>1.10 \
 		www/p5-WWW-RobotRules>=6.0
 
-BUILD_DEPENDS=	${RUN_DEPENDS}
-CPAN_AUTHOR=	ETHER
+TEST_DEPENDS =	devel/p5-Test-Fatal \
+		devel/p5-Test-RequiresInternet
 
+PKG_ARCH=	*
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/www/p5-libwww/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo	14 Dec 2015 07:02:09 -	1.16
+++ distinfo	18 Sep 2017 11:18:27 -
@@ -1,2 +1,2 @@
-SHA256 (libwww-perl-6.15.tar.gz) = bzSdRcIbHsBQHEQ338twVwlA5sPVv/eDvZHUzd6tgyI=
-SIZE (libwww-perl-6.15.tar.gz) = 141936
+SHA256 (libwww-perl-6.26.tar.gz) = 0MVDUnX4Y4/zb/+PZVrSzK0RVuZsxHv6z7nkT8WFsk8=
+SIZE (libwww-perl-6.26.tar.gz) = 162165
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/www/p5-libwww/pkg/PLIST,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST
--- pkg/PLIST	23 Oct 2014 19:49:45 -	1.19
+++ pkg/PLIST	18 Sep 2017 11:22:55 -
@@ -9,12 +9,13 @@ ${P5SITE}/LWP/Authen/Basic.pm
 ${P5SITE}/LWP/Authen/Digest.pm
 ${P5SITE}/LWP/Authen/Ntlm.pm
 ${P5SITE}/LWP/ConnCache.pm
+${P5SITE}/LWP/Debug/
 ${P5SITE}/LWP/Debug.pm
+${P5SITE}/LWP/Debug/TraceHTTP.pm
 ${P5SITE}/LWP/DebugFile.pm
 ${P5SITE}/LWP/MemberMixin.pm
 ${P5SITE}/LWP/Protocol/
 ${P5SITE}/LWP/Protocol.pm
-${P5SITE}/LWP/Protocol/GHTTP.pm
 ${P5SITE}/LWP/Protocol/cpan.pm
 ${P5SITE}/LWP/Protocol/data.pm
 ${P5SITE}/LWP/Protocol/file.pm
@@ -28,8 +29,9 @@ ${P5SITE}/LWP/Protocol/nogo.pm
 ${P5SITE}/LWP/RobotUA.pm
 ${P5SITE}/LWP/Simple.pm
 ${P5SITE}/LWP/UserAgent.pm
-${P5SITE}/lwpcook.pod
-${P5SITE}/lwptut.pod
+${P5SITE}/libwww/
+${P5SITE}/libwww/lwpcook.pod
+${P5SITE}/libwww/lwptut.pod
 @man man/man1/lwp-download.1
 @man man/man1/lwp-dump.1
 @man man/man1/lwp-mirror.1
@@ -43,5 +45,5 @@ ${P5SITE}/lwptut.pod
 @man man/man3p/LWP::RobotUA.3p
 @man man/man3p/LWP::Simple.3p
 @man man/man3p/LWP::UserAgent.3p
-@man man/man3p/lwpcook.3p
-@man man/man3p/lwptut.3p
+@man man/man3p/libwww::lwpcook.3p
+@man man/man3p/libwww::lwptut.3p


[maintainer update] net/tcpreplay 4.0.5 -> 4.2.6

2017-09-23 Thread Nigel Taylor
Has been moved to github.

builds on amd64.

Ok?
Index: Makefile
===
RCS file: /home/cvs/ports/net/tcpreplay/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile	8 May 2017 18:10:25 -	1.38
+++ Makefile	29 Aug 2017 21:04:34 -
@@ -2,18 +2,20 @@
 
 COMMENT=	resend network traffic saved by tcpdump
 
-DISTNAME=	tcpreplay-4.0.5
 CATEGORIES=	net
-REVISION=	2
 
-HOMEPAGE=	http://tcpreplay.appneta.com/	
+GH_ACCOUNT =	appneta
+GH_PROJECT =	tcpreplay
+GH_TAGNAME =	v4.2.6
+
+HOMEPAGE=	http://tcpreplay.appneta.com/
 
 MAINTAINER=	Nigel Taylor <ni...@openbsd.org>
 
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
 
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=tcpreplay/}
+MASTER_SITES = https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${GH_TAGNAME}/
 
 WANTLIB=	c dnet>=1
 
Index: distinfo
===
RCS file: /home/cvs/ports/net/tcpreplay/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo	16 Oct 2014 13:00:56 -	1.9
+++ distinfo	29 Aug 2017 21:05:44 -
@@ -1,2 +1,2 @@
-SHA256 (tcpreplay-4.0.5.tar.gz) = Y3mMityeW+eUZ+I1k4OM4OYXslk4z84xFv7aJjA0TYA=
-SIZE (tcpreplay-4.0.5.tar.gz) = 2059744
+SHA256 (tcpreplay-4.2.6.tar.gz) = BDdWxTLauT4r4zpRfvRrE0H3I5J4oQRa5nAEHdikUx0=
+SIZE (tcpreplay-4.2.6.tar.gz) = 3494827
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure	16 Oct 2014 13:43:48 -	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-$OpenBSD: patch-configure,v 1.4 2014/10/16 13:43:48 nigel Exp $
 configure.orig	Fri Sep  5 17:16:38 2014
-+++ configure	Fri Oct 10 15:21:36 2014
-@@ -18765,7 +18765,7 @@ else
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--[
-+
- #include 
- #include 
- #include 
-@@ -18793,7 +18793,7 @@ main(int argc, char *argv[]) {
- 
- /* else suck, no good */
- exit(-1);
--}]
-+}
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
- 
Index: patches/patch-src_defines_h_in
===
RCS file: patches/patch-src_defines_h_in
diff -N patches/patch-src_defines_h_in
--- patches/patch-src_defines_h_in	6 Jul 2016 10:29:51 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_defines_h_in,v 1.1 2016/07/06 10:29:51 jasper Exp $
-
-CVE-2016-6160
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=829350
-
 src/defines.h.in.orig	Fri May  9 19:28:13 2014
-+++ src/defines.h.in	Wed Jul  6 10:54:28 2016
-@@ -145,7 +145,7 @@ typedef struct tcpr_speed_s {
- #define DEFAULT_MTU 1500/* Max Transmission Unit of standard ethernet
-  * don't forget *frames* are MTU + L2 header! */
- 
--#define MAXPACKET 65535 /* was 16436 linux loopback, but maybe something is bigger then
-+#define MAXPACKET 65549 /* was 16436 linux loopback, but maybe something is bigger then
-linux loopback */
- 
- #define MAX_SNAPLEN 65535   /* tell libpcap to capture the entire packet */
Index: patches/patch-src_tcprewrite_c
===
RCS file: patches/patch-src_tcprewrite_c
diff -N patches/patch-src_tcprewrite_c
--- patches/patch-src_tcprewrite_c	6 Jul 2016 10:29:51 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_tcprewrite_c,v 1.1 2016/07/06 10:29:51 jasper Exp $
-
-CVE-2016-6160
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=829350
-
 src/tcprewrite.c.orig	Fri May  9 19:28:13 2014
-+++ src/tcprewrite.c	Wed Jul  6 10:54:06 2016
-@@ -250,6 +250,8 @@ rewrite_packets(tcpedit_t *tcpedit, pcap_t *pin, pcap_
- packetnum++;
- dbgx(2, "packet " COUNTER_SPEC " caplen %d", packetnum, pkthdr.caplen);
- 
-+if (pkthdr.caplen > MAXPACKET)
-+errx(-1, "Frame too big, caplen %d exceeds %d", pkthdr.caplen, MAXPACKET);
- /* 
-  * copy over the packet so we can pad it out if necessary and
-  * because pcap_next() returns a const ptr


[maintainer update] devel/p5-Test-CheckManifest 1.29 -> 1.31

2017-09-23 Thread Nigel Taylor
Built tested on amd64.

Changes

1.31  2017-04-21

  [IMPROVEMENT]
  * Run tests in series, not parallel. This should fix github #4.
Thanks to Michael Gray (mjg17).

1.30  2015-09-22

  [IMPROVEMENT]
  * Check duplicate entries in the MANIFEST file (Thanks to Mohammad
S Anwar (Manwar), github #5)


Ok?
Index: Makefile
===
RCS file: /home/cvs/ports/devel/p5-Test-CheckManifest/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile	20 Mar 2016 19:56:36 -	1.7
+++ Makefile	5 May 2017 23:08:46 -
@@ -2,7 +2,7 @@
 
 COMMENT =	check Manifest matches your distro
 
-DISTNAME =	Test-CheckManifest-1.29
+DISTNAME =	Test-CheckManifest-1.31
 CPAN_AUTHOR =	RENEEB
 CATEGORIES =	devel
 
Index: distinfo
===
RCS file: /home/cvs/ports/devel/p5-Test-CheckManifest/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo	28 Jul 2015 09:42:58 -	1.5
+++ distinfo	5 May 2017 23:09:14 -
@@ -1,2 +1,2 @@
-SHA256 (Test-CheckManifest-1.29.tar.gz) = rW3EbKEBkORtidZkxX0lxwxAs/cpaePeZ0V4G0WtRIs=
-SIZE (Test-CheckManifest-1.29.tar.gz) = 9832
+SHA256 (Test-CheckManifest-1.31.tar.gz) = ZnHOPykg6Qj5EvctEONjhQg6ntHuWpojASIWjvY/MtM=
+SIZE (Test-CheckManifest-1.31.tar.gz) = 10257


CVS: cvs.openbsd.org: ports

2017-09-23 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2017/09/23 04:27:35

Modified files:
graphics/py-matplotlib: Makefile 

Log message:
fix python3 flavor WANTLIB

Ok sthen@



Re: net/zabbix SSH flavor?

2017-09-21 Thread Nigel Taylor

$ cd /usr/ports/mystuff/net/zabbix
$ doas make configure
$ cd /usr/ports/pobj/zabbix-3.2.7-mysql/zabbix-3.2.7
$ ./configure --help | grep -i ssh
If you want to use SSH2 based checks:
  --with-ssh2[=DIR]   use SSH2 package [default=no], DIR is the SSH2

I don't see a --with-ssh option

that's
LIB_DEPENDS-server += security/libssh2
WANTLIB-server += ssh2
CONFIGURE_ARGS += --with-ssh2

You drop the lib on the WANTLIB, check the SHARED_LIBS in
security/libssh{,2}


On 09/21/17 19:08, William Leuschner wrote:
> Hello ports@!
> 
> I'm trying to add an `ssh` flavor to net/zabbix, which would compile
> support for SSH items into zabbix-server. As far as I can tell, the
> normal Makefile for net/zabbix doesn't build in support by default.
> 
> At the bottom of this message is what I tried so far, although it
> doesn't work. When I run `FLAVOR="mysql ssh" doas make build`, the
> output from Zabbix's configure script doesn't indicate that libssh was
> included. (Yes, I've added keepenv to my doas.conf.)
> 
> So, that leaves me with two questions:
> 1. Can anyone point me in the right direction? What am I doing wrong
> that's causing it to misbehave?
> 2. Is this something that other people are interested in, and would
> therefore warrant inclusion into the ports tree?
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/zabbix/Makefile,v
> retrieving revision 1.122
> diff -u -p -r1.122 Makefile
> --- Makefile7 Jul 2016 18:47:32 -   1.122
> +++ Makefile21 Sep 2017 17:58:23 -
> @@ -29,7 +29,7 @@ MODPHP_BUILDDEP = No
> 
>  MULTI_PACKAGES =   -main -web
>  PSEUDO_FLAVORS =   no_server
> -FLAVORS =  mysql pgsql sqlite3
> +FLAVORS =  mysql pgsql sqlite3 ssh
> 
>  SUBST_VARS +=  PREFIX-web ZABBIX_WEB MAJV
> 
> @@ -77,7 +77,7 @@ FLAVOR =  sqlite3
>  #if non-backend-related flavors are added, add them to
>  #the following line as ":L:Nflavor1:Nflavor2" so that
>  #they don't trigger a "Conflicting flavors" error.
> -BACKEND =  ${FLAVOR}
> +BACKEND =  ${FLAVOR:L:Nssh}
>  .if ${BACKEND} == "mysql"
>  MULTI_PACKAGES += -server
>  LIB_DEPENDS-server +=  databases/mariadb,-main
> @@ -97,6 +97,13 @@ CONFIGURE_ARGS += --disable-server \
> --disable-proxy
>  .else
>  ERRORS +=  "Fatal: Conflicting flavors: ${FLAVOR}";
> +.endif
> +
> +# Include libssh if the ssh flavor is requested
> +.if ${FLAVOR:L:Mssh}
> +LIB_DEPENDS-server += security/libssh
> +WANTLIB-server += libssh
> +CONFIGURE_ARGS += --with-ssh
>  .endif
> 
>  pre-configure:
> 
> 
> ───
> William Leuschner
> wel2...@rit.edu
> 
> 



Re: zathura crashes on pdf

2017-09-14 Thread Nigel Taylor
On 09/14/17 09:21, Niels Kobschätzki wrote:
> Hi,
> 
> I have here a pdf that crashes zathura. The thing is that it is a
> commercial pdf by Michael W. Lucas so that I don't want to distribute it
> freely. I installed it from packages.
> 
> sysctl -n kern.version:
> OpenBSD 6.2-beta (GENERIC.MP) #89: Mon Sep 11 10:57:04 MDT 2017
>   dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> 
> I have a core-file available but since it is 16.9 MB in size, I don't
> want to send it to the list. It can be downloaded here:
> https://nextcloud.kobschaetzki.net/index.php/s/oJEurzKHUaIfWNW
> 
> I asked the author if I am allowed to share the pdf with the maintainer.
> As soon as I get a positive answer, I will share it with the maintainer
> who wants to fix this.
> 
> Niels
> 
> 
It's been removed.

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2017/09/13 04:38:43

Log message:
import of kopano-{core,mapi,webapp}-8.3.5.1335

Kopano is a replacement of the deprecated Zarafa (ZCP) suite.

Joint work with pirofti@

For upgrading please refer to the README.

Try the replacement...



CVS: cvs.openbsd.org: ports

2017-09-09 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2017/09/09 16:56:49

Modified files:
graphics/dpic  : Makefile distinfo 
graphics/dpic/patches: patch-Makefile 
graphics/dpic/pkg: PLIST 
Added files:
graphics/dpic/patches: patch-Makefile_in patch-dpic_c 
   patch-p2c_h patch-p2clib_c 

Log message:
Update version to 2017.08.01 patcheso for clang
run examples as a test.
ok bentley@



Re: sysutils/sleuthkit: why CONFIGURE_STYLE=simple?

2017-09-07 Thread nigel
On 09/07/17 21:38, Stuart Henderson wrote:
> On 2017/09/07 19:45, ni...@openbsd.org wrote:
>>
>> Attached update to version 4.4.2
>>
>> Switch CONFIGURE_STYLE = gnu, to stop some bulk build failures.
>> Remove need for cppunit.
>>
>> Builds on amd64.
>>
>> Ok?
> 
> I can't really comment on the sleuthkit update itself (did you check if
> a library bump is needed?), but the autoconf bits are ok with me.
> 
> 

added functions to library, major version change in log. So bumped library.
Index: Makefile
===
RCS file: /home/cvs/ports/sysutils/sleuthkit/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile	26 Jul 2017 22:45:30 -	1.21
+++ Makefile	7 Sep 2017 21:13:24 -
@@ -2,11 +2,10 @@
 
 COMMENT=		forensic toolkit based on TCT
 
-DISTNAME=		sleuthkit-4.3.0
+DISTNAME=		sleuthkit-4.4.2
 CATEGORIES=		sysutils security
-REVISION=		0
 
-SHARED_LIBS +=		tsk	0.0 # 14.0
+SHARED_LIBS +=		tsk	1.0 # 16.1
 
 HOMEPAGE=		http://www.sleuthkit.org/
 
@@ -18,17 +17,19 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MASTER_SITES =		https://github.com/sleuthkit/sleuthkit/releases/download/${DISTNAME}/
 
-WANTLIB += 		c m pthread ${COMPILER_LIBCXX} z
+WANTLIB += 		c m pthread ${COMPILER_LIBCXX} sqlite3 z
 
-CONFIGURE_STYLE =	simple
+CONFIGURE_STYLE =	gnu
 
 CONFIGURE_ARGS += 	--mandir='${PREFIX}/man' \
 			--disable-java \
 			--without-afflib \
 			--without-libewf
 
-BUILD_DEPENDS=		devel/cppunit
+CONFIGURE_ENV =		ac_cv_path_CPPUNIT_CONFIG=no
+
 RUN_DEPENDS=		converters/p5-DateManip
+LIB_DEPENDS =		databases/sqlite3
 
 NO_TEST =		Yes
 
Index: distinfo
===
RCS file: /home/cvs/ports/sysutils/sleuthkit/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo	10 Oct 2016 18:58:38 -	1.11
+++ distinfo	29 Aug 2017 21:15:44 -
@@ -1,2 +1,2 @@
-SHA256 (sleuthkit-4.3.0.tar.gz) = mJxpGD5Le+w3NGQlOIAs3KvjRqbcrTHN5F7ry5v8GR8=
-SIZE (sleuthkit-4.3.0.tar.gz) = 8539568
+SHA256 (sleuthkit-4.4.2.tar.gz) = E1lkRj9LClj82V/fcxiB/Nby8ifuuP+sAEiAyOTY3VM=
+SIZE (sleuthkit-4.4.2.tar.gz) = 8572974
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/sysutils/sleuthkit/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST	10 Oct 2016 18:58:38 -	1.8
+++ pkg/PLIST	29 Aug 2017 21:21:20 -
@@ -33,10 +33,11 @@ bin/sorter
 @bin bin/tsk_gettimes
 @bin bin/tsk_loaddb
 @bin bin/tsk_recover
+@bin bin/usnjls
 include/tsk/
 include/tsk/auto/
-include/tsk/auto/sqlite3.h
 include/tsk/auto/tsk_auto.h
+include/tsk/auto/tsk_is_image_supported.h
 include/tsk/base/
 include/tsk/base/tsk_base.h
 include/tsk/base/tsk_os.h
@@ -94,6 +95,7 @@ lib/libtsk.la
 @man man/man1/tsk_gettimes.1
 @man man/man1/tsk_loaddb.1
 @man man/man1/tsk_recover.1
+@man man/man1/usnjls.1
 share/tsk/
 share/tsk/sorter/
 share/tsk/sorter/default.sort


Re: sysutils/sleuthkit: why CONFIGURE_STYLE=simple?

2017-09-07 Thread nigel
On 09/06/17 22:01, ni...@openbsd.org wrote:
> On 09/06/17 11:34, Stuart Henderson wrote:
>> I just ran into this...
>>
>> ===>  Configuring for sleuthkit-4.3.0p0
>> checking for a BSD-compatible install... 
>> /usr/obj/ports/sleuthkit-4.3.0/bin/install -c
>> checking whether build environment is sane... yes
>> checking for a thread-safe mkdir -p... /usr/local/bin/gmkdir -p
>> [..snip..]
>> Making install in auto
>>  /usr/local/bin/gmkdir -p 
>> '/usr/obj/ports/sleuthkit-4.3.0/fake-i386/usr/local/lib'
>> /bin/sh: /usr/local/bin/gmkdir: not found
>>
>> ...which shows that it's not using CONFIGURE_STYLE=gnu.
>>
>> Is there a reason why?
>>
>>
> 
> naddy already asked me the same question to which the reply was I took
> it over like that, and someone else did the last update, it has been
> fixed once I catch up with libc / pthread I have this prepared below
> this bring it upto date with latest found by portroach.
> 
> It's one of the next lot of portroach updates - socat, tcpreplay once
> those already posted to ports@ have been ok'd and cleared
> 
> $ ident Makefile
> Makefile:
>  $OpenBSD: Makefile,v 1.21 2017/07/26 22:45:30 sthen Exp $
> 
> $ cvs -R -q diff -uNp | head -30
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/sysutils/sleuthkit/Makefile,v
> retrieving revision 1.21
> diff -u -p -r1.21 Makefile
> --- Makefile26 Jul 2017 22:45:30 -  1.21
> +++ Makefile29 Aug 2017 21:30:52 -
> @@ -2,9 +2,8 @@
> 
>  COMMENT=   forensic toolkit based on TCT
> 
> -DISTNAME=  sleuthkit-4.3.0
> +DISTNAME=  sleuthkit-4.4.2
>  CATEGORIES=sysutils security
> -REVISION=  0
> 
>  SHARED_LIBS += tsk 0.0 # 14.0
> 
> @@ -18,17 +17,19 @@ PERMIT_PACKAGE_FTP= Yes
> 
>  MASTER_SITES =
> https://github.com/sleuthkit/sleuthkit/releases/download/${DISTNAME}/
> 
> -WANTLIB += c m pthread ${COMPILER_LIBCXX} z
> +WANTLIB += c m pthread ${COMPILER_LIBCXX} sqlite3 z
> 
> -CONFIGURE_STYLE =  simple
> +CONFIGURE_STYLE =  gnu
> 
>  CONFIGURE_ARGS +=  --mandir='${PREFIX}/man' \
> --disable-java \
> 
> ...
> $ make show=MAINTAINER
> Nigel Taylor <ni...@openbsd.org>
> 
> 

Attached update to version 4.4.2

Switch CONFIGURE_STYLE = gnu, to stop some bulk build failures.
Remove need for cppunit.

Builds on amd64.

Ok?


Index: Makefile
===
RCS file: /home/cvs/ports/sysutils/sleuthkit/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile	26 Jul 2017 22:45:30 -	1.21
+++ Makefile	29 Aug 2017 21:30:52 -
@@ -2,9 +2,8 @@
 
 COMMENT=		forensic toolkit based on TCT
 
-DISTNAME=		sleuthkit-4.3.0
+DISTNAME=		sleuthkit-4.4.2
 CATEGORIES=		sysutils security
-REVISION=		0
 
 SHARED_LIBS +=		tsk	0.0 # 14.0
 
@@ -18,17 +17,19 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MASTER_SITES =		https://github.com/sleuthkit/sleuthkit/releases/download/${DISTNAME}/
 
-WANTLIB += 		c m pthread ${COMPILER_LIBCXX} z
+WANTLIB += 		c m pthread ${COMPILER_LIBCXX} sqlite3 z
 
-CONFIGURE_STYLE =	simple
+CONFIGURE_STYLE =	gnu
 
 CONFIGURE_ARGS += 	--mandir='${PREFIX}/man' \
 			--disable-java \
 			--without-afflib \
 			--without-libewf
 
-BUILD_DEPENDS=		devel/cppunit
+CONFIGURE_ENV =		ac_cv_path_CPPUNIT_CONFIG=no
+
 RUN_DEPENDS=		converters/p5-DateManip
+LIB_DEPENDS =		databases/sqlite3
 
 NO_TEST =		Yes
 
Index: distinfo
===
RCS file: /home/cvs/ports/sysutils/sleuthkit/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo	10 Oct 2016 18:58:38 -	1.11
+++ distinfo	29 Aug 2017 21:15:44 -
@@ -1,2 +1,2 @@
-SHA256 (sleuthkit-4.3.0.tar.gz) = mJxpGD5Le+w3NGQlOIAs3KvjRqbcrTHN5F7ry5v8GR8=
-SIZE (sleuthkit-4.3.0.tar.gz) = 8539568
+SHA256 (sleuthkit-4.4.2.tar.gz) = E1lkRj9LClj82V/fcxiB/Nby8ifuuP+sAEiAyOTY3VM=
+SIZE (sleuthkit-4.4.2.tar.gz) = 8572974
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/sysutils/sleuthkit/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST	10 Oct 2016 18:58:38 -	1.8
+++ pkg/PLIST	29 Aug 2017 21:21:20 -
@@ -33,10 +33,11 @@ bin/sorter
 @bin bin/tsk_gettimes
 @bin bin/tsk_loaddb
 @bin bin/tsk_recover
+@bin bin/usnjls
 include/tsk/
 include/tsk/auto/
-include/tsk/auto/sqlite3.h
 include/tsk/auto/tsk_auto.h
+include/tsk/auto/tsk_is_image_supported.h
 include/tsk/base/
 include/tsk/base/tsk_base.h
 include/tsk/base/tsk_os.h
@@ -94,6 +95,7 @@ lib/libtsk.la
 @man man/man1/tsk_gettimes.1
 @man man/man1/tsk_loaddb.1
 @man man/man1/tsk_recover.1
+@man man/man1/usnjls.1
 share/tsk/
 share/tsk/sorter/
 share/tsk/sorter/default.sort


Re: Update: graphics/dpic 2014.01.01 -> 2017.08.01

2017-09-07 Thread Nigel Taylor
On 08/27/17 23:27, Nigel Taylor wrote:
> On 08/23/17 22:47, Nigel Taylor wrote:
>> On 08/23/17 20:58, Nigel Taylor wrote:
>>> Hasn't been updated in a while.
>>>
>>> patched for clang
>>> tests added, by running all examples, requires manual checks of results
>>> afterwards.
>>>
>>> Tried only on amd64.
>>>
>>> Ok?
>>>
>>>
>> Missed the attachment again.
>>
> Ok?
> 
> 

Ping



Re: Maintainer Update multimedia/get_flash_videos 1.25.93 -> 1.25.94

2017-09-07 Thread nigel
On 08/27/17 23:26, ni...@openbsd.org wrote:
> On 08/23/17 20:21, ni...@openbsd.org wrote:
>> Update to fix issues 212, 215 and change some old url's.
>>
>> Home page changed to github home page.
>>
>> Ok?
>>
> 
> Ok?
> 
> 
Ping



CVS: cvs.openbsd.org: ports

2017-09-07 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2017/09/07 13:15:19

Modified files:
www/p5-LWP-Protocol-https: Makefile distinfo 

Log message:
Update version to 6.07
Ok bluhm@



CVS: cvs.openbsd.org: ports

2017-09-07 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2017/09/07 13:11:36

Modified files:
www/p5-HTTP-Message: Makefile distinfo 
www/p5-HTTP-Message/pkg: PLIST 

Log message:
Update to version 6.13
Ok bluhm@



CVS: cvs.openbsd.org: ports

2017-09-07 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2017/09/07 13:07:38

Modified files:
net/p5-Net-HTTP: Makefile distinfo 
net/p5-Net-HTTP/pkg: PLIST 

Log message:
Update to 1.17
1.17 is a minor fix to tests only source changes checked and no changes.
Ok bluhm@ for 1.16



CVS: cvs.openbsd.org: ports

2017-09-07 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2017/09/07 12:58:40

Modified files:
net/p5-IO-Socket-Socks: Makefile distinfo 

Log message:
Update to 0.74
Ok bluhm@



CVS: cvs.openbsd.org: ports

2017-09-07 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2017/09/07 12:54:07

Modified files:
multimedia/p5-Storable-AMF: Makefile distinfo 

Log message:
Update to version 1.23
Ok bluhm@



Re: sysutils/sleuthkit: why CONFIGURE_STYLE=simple?

2017-09-06 Thread nigel
On 09/06/17 11:34, Stuart Henderson wrote:
> I just ran into this...
> 
> ===>  Configuring for sleuthkit-4.3.0p0
> checking for a BSD-compatible install... 
> /usr/obj/ports/sleuthkit-4.3.0/bin/install -c
> checking whether build environment is sane... yes
> checking for a thread-safe mkdir -p... /usr/local/bin/gmkdir -p
> [..snip..]
> Making install in auto
>  /usr/local/bin/gmkdir -p 
> '/usr/obj/ports/sleuthkit-4.3.0/fake-i386/usr/local/lib'
> /bin/sh: /usr/local/bin/gmkdir: not found
> 
> ...which shows that it's not using CONFIGURE_STYLE=gnu.
> 
> Is there a reason why?
> 
> 

naddy already asked me the same question to which the reply was I took
it over like that, and someone else did the last update, it has been
fixed once I catch up with libc / pthread I have this prepared below
this bring it upto date with latest found by portroach.

It's one of the next lot of portroach updates - socat, tcpreplay once
those already posted to ports@ have been ok'd and cleared

$ ident Makefile
Makefile:
 $OpenBSD: Makefile,v 1.21 2017/07/26 22:45:30 sthen Exp $

$ cvs -R -q diff -uNp | head -30
Index: Makefile
===
RCS file: /home/cvs/ports/sysutils/sleuthkit/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile26 Jul 2017 22:45:30 -  1.21
+++ Makefile29 Aug 2017 21:30:52 -
@@ -2,9 +2,8 @@

 COMMENT=   forensic toolkit based on TCT

-DISTNAME=  sleuthkit-4.3.0
+DISTNAME=  sleuthkit-4.4.2
 CATEGORIES=sysutils security
-REVISION=  0

 SHARED_LIBS += tsk 0.0 # 14.0

@@ -18,17 +17,19 @@ PERMIT_PACKAGE_FTP= Yes

 MASTER_SITES =
https://github.com/sleuthkit/sleuthkit/releases/download/${DISTNAME}/

-WANTLIB += c m pthread ${COMPILER_LIBCXX} z
+WANTLIB += c m pthread ${COMPILER_LIBCXX} sqlite3 z

-CONFIGURE_STYLE =  simple
+CONFIGURE_STYLE =  gnu

 CONFIGURE_ARGS +=  --mandir='${PREFIX}/man' \
    --disable-java \

...
$ make show=MAINTAINER
Nigel Taylor <ni...@openbsd.org>



Re: openbsd-wip ports to remove

2017-09-01 Thread Nigel Taylor
On 09/01/17 20:33, Sergey Bronnikov wrote:
> Hello, everyone
> 
> I'm going to remove ports from a list below in openbsd-wip repository
> (https://github.com/jasperla/openbsd-wip/) soon. Almost all of these
> ports are dependencies of a Tapper testing framework, but Tapper is
> abandoned now and I don't need them.  Feel free to take a maintainership
> for any of these ports or commit to the official tree.
> 
> sysutils/p5-Sys-Syslog
> textproc/p5-Text-Abbrev
> textproc/p5-String-Escape
> textproc/p5-String-Util
> textproc/p5-Text-CSV-Slurp
> textproc/p5-String-Diff
> textproc/p5-Text-Balanced
> devel/p5-Lexical-SealRequireHints
> devel/p5-CHI
> devel/p5-File-Pid
> devel/p5-TAP-DOM
> devel/p5-Term-VT102
> devel/p5-App-Rad
> devel/p5-Test-Nginx
> devel/p5-Test-Simple
> devel/p5-HTML-FromANSI
> devel/p5-Regexp-Grammars
> devel/p5-experimental
> devel/p5-Data-Dumper
> devel/p5-Data-Serializer
> devel/p5-Sys-Info-Base
> devel/p5-Unix-Processors
> devel/p5-Math-BigInt-Pari
> devel/p5-MooX-Types-MooseLike-Numeric
> devel/p5-Sysadm-Install
> devel/p5-Data-Rmap
> devel/p5-Object-Enum
> devel/p5-Bencode
> devel/p5-Data-YAML
> devel/p5-DateTime-Format-DateParse
> devel/p5-Benchmark-Perl-Formance
> devel/p5-Devel-Platform-Info
> devel/p5-Devel-Backtrace
> devel/p5-Language-Expr
> devel/p5-Compress-PPMd
> devel/p5-Test-Sys-Info
> devel/p5-Test-TAPv13
> devel/p5-multidimensional
> devel/p5-Term-VT102-Boundless
> devel/p5-Test-Fixture-DBIC-Schema
> devel/p5-Debug-ShowStuff
> devel/p5-Format-Human-Bytes
> devel/p5-Test-Mock-LWP
> devel/p5-Sys-Info
> devel/p5-BSD-Sysctl
> devel/p5-Set-Intersection
> devel/p5-bareword-filehandles
> devel/p5-Daemon-Daemonize
> devel/p5-Data-DPath
> devel/p5-Convert-Bencode_XS
> devel/p5-Kwalify
> devel/p5-MooseX-ClassAttribute
> devel/p5-Data-Taxi
> devel/p5-Hash-MoreUtils
> devel/p5-MooseX-Singleton
> devel/p5-Scalar-List-Utils
> devel/p5-Getopt-Long
> devel/p5-App-Daemon
> devel/p5-Data-Clone
> devel/p5-ExtUtils-MakeMaker
> devel/p5-Convert-Bencode
> devel/p5-Sys-Info-Driver-BSD
> www/p5-Catalyst-View-HTML-Mason
> www/p5-TAP-Formatter-HTML
> www/p5-Test-WWW-Selenium
> security/p5-Digest-JHash
> security/p5--Crypt-DH
> databases/p5-DBIx-Class-InflateColumn-Object-Enum
> 
> Sergey
> 
> 
Some of these are part of core Perl, and should never go in the ports
tree (unless due to be removed in the next perl version and working on a
replacement).

$ corelist Data::Dumper Test::Simple ExtUtils::MakeMaker

Data for 2017-07-15
Data::Dumper was first released with perl 5.005

Data for 2017-07-15
Test::Simple was first released with perl v5.6.2

Data for 2017-07-15
ExtUtils::MakeMaker was first released with perl 5
$

Your find these in the base

$ egrep -r "Test/Simple|ExtUtils/MakeMaker|Data/Dumper" base/mi
base/md.amd64


base/mi:./usr/libdata/perl5/ExtUtils/MakeMaker
base/mi:./usr/libdata/perl5/ExtUtils/MakeMaker.pm
base/mi:./usr/libdata/perl5/ExtUtils/MakeMaker/Config.pm
base/mi:./usr/libdata/perl5/ExtUtils/MakeMaker/FAQ.pod
base/mi:./usr/libdata/perl5/ExtUtils/MakeMaker/Locale.pm
base/mi:./usr/libdata/perl5/ExtUtils/MakeMaker/Tutorial.pod
base/mi:./usr/libdata/perl5/ExtUtils/MakeMaker/version.pm
base/mi:./usr/libdata/perl5/Test/Simple.pm
base/md.amd64:./usr/libdata/perl5/amd64-openbsd/Data/Dumper.pm
base/md.amd64:./usr/libdata/perl5/amd64-openbsd/auto/Data/Dumper
base/md.amd64:./usr/libdata/perl5/amd64-openbsd/auto/Data/Dumper/Dumper.so


There may be more that are core perl, these three can go.

The is already a p5-Math-BigInt-Pari not under devel but math so a
conflicting and duplication of what's in the ports tree,

$ pkg_info -Pq p5-Math-BigInt-Pari-1.18.tgz
math/p5-Math-BigInt-Pari

can't pick any others out at first slight, needs to be checks made
before any takes over and works on these

My quick check

$ sed -e 's%^.*/p5-%%;s/-/::/g' pl.1  | xargs corelist | grep first
Sys::Syslog was first released with perl 5
Text::Abbrev was first released with perl 5
Text::Balanced was first released with perl v5.7.3
Test::Simple was first released with perl v5.6.2
experimental was first released with perl v5.19.11
Data::Dumper was first released with perl 5.005
Getopt::Long was first released with perl 5
ExtUtils::MakeMaker was first released with perl 5
$ sed -e 's%^.*/p5-%p5-%' pl.1 | xargs pkg_info -Pq
math/p5-Math-BigInt-Pari



Re: youtube-dl: missing PLIST update

2017-08-30 Thread Nigel Taylor
On 08/30/17 14:32, Walter Alejandro Iglesias wrote:
> Hi,
> 
> In article <dcc8152a-9533-20c0-3838-648aee82f...@btinternet.com> Nigel Taylor 
> <njtaylor0...@btinternet.com> wrote:
>> On 08/28/17 07:59, Sebastien Marie wrote:
>>> Hi,
>>>
>>> youtube-dl seems to be broken at my side:
>>>
>>> I have the following error when I ran youtube-dl:
>>>
>>>   ...
>>>   File 
>>> "/usr/local/lib/python2.7/site-packages/youtube_dl/extractor/extractors.py",
>>>  line 190, in 
>>> from .clippit import ClippitIE
>>> ImportError: No module named clippit
>>>
>>> It seems to me that a PLIST update was missed... resulting clippit.py to
>>> be not distributed with package.
>>>
>>> The following diff corrects it.
>>>
>>> Thanks.
>>>
>>
>> Done already...
>>
>> CVSROOT:/cvs
>> Module name:ports
>> Changes by: ni...@cvs.openbsd.org   2017/08/27 15:45:03
>>
>> Modified files:
>> www/youtube-dl : Makefile
>> www/youtube-dl/pkg: PLIST
>>
>> Log message:
>> add missing from PLIST
>> Ok fcambus@
>>
>>
> 
> 
> I updated today snapshot and packages.  youtube-dl still fails showing
> that error.
> 
> Is this fix already committed?
> 
> 
The cvs bit is the commit, however packages may not have been built yet,
there is an issue with python building after other changes. Maybe a few
days before packages become available.



Re: youtube-dl: missing PLIST update

2017-08-28 Thread Nigel Taylor
On 08/28/17 07:59, Sebastien Marie wrote:
> Hi,
> 
> youtube-dl seems to be broken at my side:
> 
> I have the following error when I ran youtube-dl:
> 
>   ...
>   File 
> "/usr/local/lib/python2.7/site-packages/youtube_dl/extractor/extractors.py", 
> line 190, in 
> from .clippit import ClippitIE
> ImportError: No module named clippit
> 
> It seems to me that a PLIST update was missed... resulting clippit.py to
> be not distributed with package.
> 
> The following diff corrects it.
> 
> Thanks.
> 

Done already...

CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2017/08/27 15:45:03

Modified files:
www/youtube-dl : Makefile
www/youtube-dl/pkg: PLIST

Log message:
add missing from PLIST
Ok fcambus@



CVS: cvs.openbsd.org: ports

2017-08-27 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2017/08/27 17:07:39

Modified files:
www/p5-HTML-Base: Makefile 
www/p5-HTML-Base/pkg: PLIST 

Log message:
Perl placed was placed in P5ARCH should be in P5SITE, it's not arch
dependant.

OK bluhm@



Re: Update: graphics/dpic 2014.01.01 -> 2017.08.01

2017-08-27 Thread Nigel Taylor
On 08/23/17 22:47, Nigel Taylor wrote:
> On 08/23/17 20:58, Nigel Taylor wrote:
>> Hasn't been updated in a while.
>>
>> patched for clang
>> tests added, by running all examples, requires manual checks of results
>> afterwards.
>>
>> Tried only on amd64.
>>
>> Ok?
>>
>>
> Missed the attachment again.
> 
Ok?



Re: Maintainer Update multimedia/get_flash_videos 1.25.93 -> 1.25.94

2017-08-27 Thread nigel
On 08/23/17 20:21, ni...@openbsd.org wrote:
> Update to fix issues 212, 215 and change some old url's.
> 
> Home page changed to github home page.
> 
> Ok?
> 

Ok?



Re: Update multimedia/p5-Storable-AMF 1.08 -> 1.23

2017-08-27 Thread Nigel Taylor
On 08/23/17 22:56, Nigel Taylor wrote:
> Changes
> 
> 1.232016-06-29
>   - Race conditions in tests
> 
> 1.222016-06-28
>   - Portability issues with 5.010 and etc
> 
> 1.202016-06-27
> - test source cleanup
>   - rare chance memleak fixed
>   - shared state buffer
> 
> 1.09-10 2016-06-27
> - FIXING JSON::XS booleans tests
> 
> 1.082015-05-29
> - Skipping test for Win32
> 
> Tested on amd64.
> 
> Attached diff.
> 
> Ok?
> 
Ok?



Re: Update net/p5-Net-HTTP 6.09 -> 6.16

2017-08-27 Thread Nigel Taylor
On 08/23/17 22:44, Nigel Taylor wrote:
> Changes
> 
> 6.16  2017-05-29 10:46:24-04:00 America/Toronto
> - Bump IO::Socket::SSL version from 1.38 to 2.012
> 
> 6.15  2017-05-12 14:57:02+02:00 Europe/Paris
> - Fix t/rt-112313.t (Shoichi Kaji)
> 
> 6.14  2017-04-24 11:27:26-04:00 America/Toronto
> - Improvements to live tests (Shoichi Kaji and Kent Fredric)
> - Fix a bug where downloading files is sometimes very slow GH#44
> (Shoichi
>   Kaji)
> 
> 6.13  2017-02-19 21:40:54-05:00 America/Toronto
> - use EWOULDBLOCK as well on all places where EAGAIN is used (GH PR#24)
> 
> 6.12  2017-01-04 23:32:54-05:00 America/Toronto
> - Fix prereqs
> 
> 6.11  2017-01-04 15:05:57-05:00 America/Toronto
> - Updated the Changes file
> - When using Net::SSL, pending data was potentially ignored GH PR#7
> (Jean-Louis Martineau)
> 
> 6.10-DEV 2016-12-30
> - Added LICENSE
> - Added 'use warnings' to everywhere that lacked it
> - Drop all use of Test.pm
> - Removed unneeded uses of 'use vars'
> - Switch live tests to use Google.
> - Fix RT#112313 - Hang in my_readline() when keep-alive => 1 and
> $response_size % 1024 == 0
> 
> Attached diff.
> 
> Tested on amd64.
> 
> Note for live testing set LIVE_TEST. make LIVE_TEST=Yes test
> 
> Ok?
> 
Remove BUILD_DEPENDS= ${RUN_DEPENDS}

Ok?
Index: Makefile
===
RCS file: /home/cvs/ports/net/p5-Net-HTTP/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile	20 Mar 2016 19:56:53 -	1.4
+++ Makefile	25 Aug 2017 14:24:12 -
@@ -2,7 +2,7 @@
 
 COMMENT =	Perl HTTP connection client
 
-DISTNAME =	Net-HTTP-6.09
+DISTNAME =	Net-HTTP-6.16
 CATEGORIES =	net
 
 MAINTAINER =	Nigel Taylor <ni...@openbsd.org>
@@ -14,11 +14,12 @@ MODULES =	cpan
 PKG_ARCH =	*
 
 RUN_DEPENDS =	www/p5-URI
-BUILD_DEPENDS =	${RUN_DEPENDS}
 
 .ifdef LIVE_TEST
-TEST_DEPENDS =	security/p5-IO-Socket-SSL>=1.38
-CONFIGURE_ARGS +=--live-tests
+TEST_DEPENDS =	security/p5-IO-Socket-SSL>=2.012 \
+		net/p5-IO-Socket-INET6
+.else
+TEST_ENV +=	NO_NETWORK_TESTING=1
 .endif
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/net/p5-Net-HTTP/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo	28 Jul 2015 09:53:30 -	1.2
+++ distinfo	17 Jun 2017 11:12:13 -
@@ -1,2 +1,2 @@
-SHA256 (Net-HTTP-6.09.tar.gz) = UnYrk52EgGkIulRFgcVwg3X3k4w8DklsEoyj+8Ql5Y0=
-SIZE (Net-HTTP-6.09.tar.gz) = 17686
+SHA256 (Net-HTTP-6.16.tar.gz) = cMRbaq8+n7HOMKH8PPgoz67kXFwL0Uey9hfvreF2Xng=
+SIZE (Net-HTTP-6.16.tar.gz) = 34458
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/net/p5-Net-HTTP/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST	23 Oct 2014 19:21:09 -	1.1.1.1
+++ pkg/PLIST	6 Jan 2017 13:30:45 -
@@ -7,5 +7,6 @@ ${P5SITE}/Net/HTTP/Methods.pm
 ${P5SITE}/Net/HTTP/NB.pm
 ${P5SITE}/Net/HTTPS.pm
 @man man/man3p/Net::HTTP.3p
+@man man/man3p/Net::HTTP::Methods.3p
 @man man/man3p/Net::HTTP::NB.3p
 @man man/man3p/Net::HTTPS.3p


Re: Update net/p5-IO-Socket-Socks

2017-08-27 Thread Nigel Taylor
On 08/23/17 22:29, Nigel Taylor wrote:
> Note this requires IO::Socket::IP > 0.36 in base / perl 5.22 or later.
> 
> Changes Add IPv6 support plus fixes.
> 
> Diff attached.
> 
> Tested on amd64 (no IPv6 here to use).
> 
> Ok?
> 

Ok?
Index: Makefile
===
RCS file: /home/cvs/ports/net/p5-IO-Socket-Socks/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile	20 Mar 2016 19:56:51 -	1.8
+++ Makefile	5 May 2017 22:50:52 -
@@ -2,7 +2,7 @@
 
 COMMENT =	create SOCKS v4/v5 client or server
 
-DISTNAME =	IO-Socket-Socks-0.65
+DISTNAME =	IO-Socket-Socks-0.74
 
 CATEGORIES =	net
 CPAN_AUTHOR =	OLEG
Index: distinfo
===
RCS file: /home/cvs/ports/net/p5-IO-Socket-Socks/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo	16 Oct 2014 12:54:21 -	1.5
+++ distinfo	5 May 2017 22:51:32 -
@@ -1,2 +1,2 @@
-SHA256 (IO-Socket-Socks-0.65.tar.gz) = DPo8pTuQCHh5+/qmtGaLlVqTmlnY9Aq7I8PCKGQY64k=
-SIZE (IO-Socket-Socks-0.65.tar.gz) = 26271
+SHA256 (IO-Socket-Socks-0.74.tar.gz) = N/Bxos9LqPCQoil8ZIK3osUJ61Lc1s5dgDXU7ixoJLE=
+SIZE (IO-Socket-Socks-0.74.tar.gz) = 27933


Re: Update www/p5-LWP-Protocol-https 6.06 -> 6.07

2017-08-27 Thread Nigel Taylor
On 08/23/17 22:17, Nigel Taylor wrote:
> On 08/23/17 22:16, Nigel Taylor wrote:
>> Changes for 6.07
>>
>>
>> 6.07  2017-02-19
>> - Cleaned up the Changes log
>> - Explicitly add hostname for SNI to start_SSL (GH PR#17)
>> - Fix the license name
>> - Update some documentation on SSL args
>> - Fix bug when checking for Mozilla::CA (GH PR#29)
>>
>>
>> Tested on amd64
>>
>> Ok?
>>
>>
> Attached missing diff
> 
Removed BUILD_DEPDNS = ${RUN_DPENDS}

Ok?
Index: Makefile
===
RCS file: /home/cvs/ports/www/p5-LWP-Protocol-https/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile	20 Mar 2016 19:57:21 -	1.3
+++ Makefile	25 Aug 2017 14:26:34 -
@@ -2,9 +2,8 @@
 
 COMMENT =	adds support for https to p5-libwww
 
-DISTNAME =	LWP-Protocol-https-6.06
+DISTNAME =	LWP-Protocol-https-6.07
 CATEGORIES =	www net security
-REVISION =	0
 
 MAINTAINER =	Nigel Taylor <ni...@openbsd.org>
 
@@ -19,6 +18,6 @@ RUN_DEPENDS =	net/p5-Net-HTTP>=6 \
 		security/p5-Mozilla-CA-Fake>=20110101 \
 		www/p5-libwww>=6.06
 
-BUILD_DEPENDS =	${RUN_DEPENDS}
+TEST_DEPENDS =	devel/p5-Test-RequiresInternet
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/www/p5-LWP-Protocol-https/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo	23 Oct 2014 19:33:22 -	1.1.1.1
+++ distinfo	21 Feb 2017 10:08:10 -
@@ -1,2 +1,2 @@
-SHA256 (LWP-Protocol-https-6.06.tar.gz) = uGyDzB3PSm+E4vvjL5w5WRo25uQYrwBTNQXzRSSWre8=
-SIZE (LWP-Protocol-https-6.06.tar.gz) = 8376
+SHA256 (LWP-Protocol-https-6.07.tar.gz) = UizJRs+EoXdjBKVzelS4gi7J55smTQugcipwRz2/uec=
+SIZE (LWP-Protocol-https-6.07.tar.gz) = 9184


Re: Update www/p5-HTTP-Message 6.11 -> 6.13

2017-08-27 Thread Nigel Taylor
On 08/23/17 22:08, Nigel Taylor wrote:
> For some reason portroach reports still reports 6.11 as latest.
> 
> 
> Changes
> 
> Revision history for HTTP-Message
> 
> 6.13  2017-06-20 01:07:03Z
> - Non-TRIAL release of changes found in 6.12
> 
> 6.12  2017-06-15 18:03:50Z (TRIAL RELEASE)
> - If an object is passed to HTTP::Request, it must provide a canonical()
>   method (Olaf Alders)
> - Make sure status messages don't die by checking the status exists
> before
>   checking the value range (Kent Fredric, GH #39)
> - Add a .mailmap file to clean up the contributors list
> - Avoid inconsistent setting of content to undef (Jerome Eteve)
> - Simplify the way some methods are created (Tom Hukins)
> - Remove some indirect object notation (Chase Whitener)
> - Fix example in Pod (Tobias Leich)
> - Add support for HTTP PATCH method (Mickey Nasriachi)
> 
> 
> Tested on amd64
> 
> Ok?
> 
> 
Removed BUILD_DEPENDS = ${RUN_DEPENDS}

Ok?
Index: Makefile
===
RCS file: /home/cvs/ports/www/p5-HTTP-Message/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile	20 Mar 2016 19:57:20 -	1.4
+++ Makefile	25 Aug 2017 13:08:32 -
@@ -2,7 +2,7 @@
 
 COMMENT =	HTTP Style Messages
 
-DISTNAME =	HTTP-Message-6.11
+DISTNAME =	HTTP-Message-6.13
 CATEGORIES =	www
 
 MAINTAINER =	Nigel Taylor <ni...@openbsd.org>
@@ -19,7 +19,7 @@ RUN_DEPENDS =	textproc/p5-Encode-Locale>
 		www/p5-LWP-MediaTypes>=6.00 \
 		www/p5-URI>=1.10
 
-BUILD_DEPENDS =	${RUN_DEPENDS}
+TEST_DEPENDS =	devel/p5-Try-Tiny
 
 post-build:
 		@find ${WRKSRC}/blib \( -name "*.orig" -or -name "*.rej" \) -exec rm -f {} \;
Index: distinfo
===
RCS file: /home/cvs/ports/www/p5-HTTP-Message/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo	10 Sep 2015 20:08:40 -	1.3
+++ distinfo	2 Jul 2017 00:14:20 -
@@ -1,2 +1,2 @@
-SHA256 (HTTP-Message-6.11.tar.gz) = 57NoB3rmoYjZmSBBHY9SqOWs+zlXTU9cJPRv0iUz2Bs=
-SIZE (HTTP-Message-6.11.tar.gz) = 59981
+SHA256 (HTTP-Message-6.13.tar.gz) = 8l84Qo3oUeVmHnLxJEdklIUuswgSNYsH8cOiifb17e0=
+SIZE (HTTP-Message-6.13.tar.gz) = 74413
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/www/p5-HTTP-Message/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST	28 Jul 2015 10:03:06 -	1.2
+++ pkg/PLIST	2 Jul 2017 00:15:07 -
@@ -14,6 +14,8 @@ ${P5SITE}/HTTP/Response.pm
 ${P5SITE}/HTTP/Status.pm
 @man man/man3p/HTTP::Config.3p
 @man man/man3p/HTTP::Headers.3p
+@man man/man3p/HTTP::Headers::Auth.3p
+@man man/man3p/HTTP::Headers::ETag.3p
 @man man/man3p/HTTP::Headers::Util.3p
 @man man/man3p/HTTP::Message.3p
 @man man/man3p/HTTP::Request.3p


CVS: cvs.openbsd.org: ports

2017-08-27 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2017/08/27 15:56:41

Modified files:
www/p5-HTTP-Cookies: Makefile distinfo 

Log message:
Update to version 6.04. feedback from bluhm@
add TEST_DEPENDS, remove BUILD_DEPENDS = ${RUN_DEPENDS}
Ok bluhm@



CVS: cvs.openbsd.org: ports

2017-08-27 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2017/08/27 15:47:43

Modified files:
security/nikto : Makefile distinfo 
security/nikto/pkg: PLIST 
Added files:
security/nikto/patches: patch-program_nikto_pl 
patch-program_plugins_nikto_core_plugin 
Removed files:
security/nikto/patches: patch-nikto_pl 
patch-plugins_nikto_core_plugin 

Log message:
Update to new version and move to github.
feedback from sthen@ fixed.
ok sthen@



CVS: cvs.openbsd.org: ports

2017-08-27 Thread Nigel Taylor
CVSROOT:/cvs
Module name:ports
Changes by: ni...@cvs.openbsd.org   2017/08/27 15:45:03

Modified files:
www/youtube-dl : Makefile 
www/youtube-dl/pkg: PLIST 

Log message:
add missing from PLIST
Ok fcambus@



  1   2   3   4   5   6   7   >