UPDATE archivers/zopfli

2018-06-08 Thread Björn Ketelaars
Enclosed diff brings zopfli to 1.0.2, which fixes some bugs. If
I understand [0] correctly, this version should build, and work on the
previously excluded m88k. However, I'm unable to test.

Built, and tested on amd64.

Comments/OKs?

[0]
https://github.com/google/zopfli/commit/2270ffe3c107345d983b66b1f26a80b7ab528ac4#diff-53ba42f17ad54bd8994b702d97593987


Index: Makefile
===
RCS file: /cvs/ports/archivers/zopfli/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile18 Apr 2017 13:09:23 -  1.4
+++ Makefile9 Jun 2018 04:55:08 -
@@ -1,13 +1,10 @@
 # $OpenBSD: Makefile,v 1.4 2017/04/18 13:09:23 sthen Exp $
 
-# __builtin_clz
-NOT_FOR_ARCHS= ${GCC3_ARCHS}
-
 COMMENT =  deflate-compatible compression format
 
 GH_ACCOUNT =   google
 GH_PROJECT =   zopfli
-GH_TAGNAME =   zopfli-1.0.1
+GH_TAGNAME =   zopfli-1.0.2
 DISTNAME = ${GH_TAGNAME}
 
 CATEGORIES =   archivers
Index: distinfo
===
RCS file: /cvs/ports/archivers/zopfli/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo18 Apr 2017 13:09:23 -  1.3
+++ distinfo9 Jun 2018 04:55:08 -
@@ -1,2 +1,2 @@
-SHA256 (zopfli-1.0.1.tar.gz) = KXQ9cnpODs0bk+C/iUds7rZi6AmrLmqwB6CwNEgA6bQ=
-SIZE (zopfli-1.0.1.tar.gz) = 128178
+SHA256 (zopfli-1.0.2.tar.gz) = SlcDB8NxctiU7E75O26OOqzEAeeMvMUc+FshLbw3mlU=
+SIZE (zopfli-1.0.2.tar.gz) = 136035
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/archivers/zopfli/patches/patch-Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile
--- patches/patch-Makefile  18 Apr 2017 13:09:23 -  1.1
+++ patches/patch-Makefile  9 Jun 2018 04:55:08 -
@@ -1,13 +1,14 @@
 $OpenBSD: patch-Makefile,v 1.1 2017/04/18 13:09:23 sthen Exp $
 Makefile.orig  Tue Apr 18 14:06:16 2017
-+++ Makefile   Tue Apr 18 14:06:23 2017
+Index: Makefile
+--- Makefile.orig
 Makefile
 @@ -1,8 +1,8 @@
  CC = gcc
  CXX = g++
  
--CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm -O2
+-CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm -O2 -Wno-unused-function
 -CXXFLAGS = -W -Wall -Wextra -ansi -pedantic -O2
-+CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm $(COPTFLAGS)
++CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm $(COPTFLAGS) 
-Wno-unused-function
 +CXXFLAGS = -W -Wall -Wextra -ansi -pedantic $(COPTFLAGS)
  
  ZOPFLILIB_SRC = src/zopfli/blocksplitter.c src/zopfli/cache.c\



Re: NEW: libhidapi - a library for communicating with USB and Bluetooth HID devices

2018-06-08 Thread Thomas Frohwein
> In case stable self-hosted distfile is preferred, I uploaded the tarball to:

I just realized how stupid this question was and just set the Makefile and
distinfo up to the stable tarball. Updated port attached.

Again, I would prefer if the distfile would be hosted on a dedicated mirror -
the primary reason is that my site may be down during configuration times...

Thanks.


libhidapi.tgz
Description: Binary data


CVS: cvs.openbsd.org: ports

2018-06-08 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/06/08 17:39:50

Modified files:
www/webkit : Makefile 

Log message:
Drop MAINTAINER.



Re: NEW: libhidapi - a library for communicating with USB and Bluetooth HID devices

2018-06-08 Thread Thomas Frohwein
*ping*

In case stable self-hosted distfile is preferred, I uploaded the tarball to:

MASTER_SITES =  https://thfr.info/distfiles/
DISTNAME =  libhidapi-0.8.0.20160128

(of course, EXTRACT_SUFX = .tar.gz)

On Sat, May 05, 2018 at 11:59:58AM -0700, Thomas Frohwein wrote:
> Hi,
> 
> Please find attached this port of libhidapi, a library for communicating with
> HID devices via USB (or Bluetooth). It is a dependency of 2 upcoming ports 
> from
> me (openhmd and dolphin).
> 
> A few comments:
> 
> - Upstream stopped making releases in 2013 and there hasn't been any activity
>   as of late. Last release tag was 0.8.0-rc1. I set version number to
>   0.8.0.20160128 (the last number being the date of most recent commit) in
>   order to avoid EPOCH if there's ever going to be another release. Is this 
> ok?
> - The API contains hid_init which is the same name as a function in usbhid(3).
>   To avoid risk of collision, I patched this port to hidapi_hid_init instead.
> - There is a testgui - adds the dependency devel/fox and is buggy/segfaults. I
>   don't see a great justification to install this, therefore disabled it.
> - In order to work, the HID devices need to attach as ugen, _not_ uhid/uhidev.
>   This is similar to the situation with ulpt and cups (cups uses libusb1 as
>   does libhidapi). At the moment this can be done by disabling uhid and uhidev
>   in 'boot -c' (don't do that if you require USB mouse/keyboard). The way
>   forward to avoid disabling all uhid would be either quirks entries for each
>   affected device, or disabling uhid as needed with mpi@ recent patch from
>   tech@:
> 
>   https://marc.info/?l=openbsd-tech=152457124405318=2
> 
> - This has been tested with several HMDs via upcoming openhmd port (Oculus 
> Rift
>   DK1, OSVR HDK2, Dell Visor) and works. Upcoming dolphin uses hidapi for
>   controller support for e.g. the Wii controller which I don't own, and it
>   likely uses Bluetooth.




what to set for PERMIT_PACKAGE in port

2018-06-08 Thread mitchell wodach
Hi

I'm working on porting Freedink. I have the data separate form the game code.
The data has multiple licenses. so for PERMIT_PACKAGE  in Makefile I should
pick the most restrictive  license?

Thanks,

Mitch



Re: bsd.port.mk: fix update-patches target to honor user reply

2018-06-08 Thread Jeremie Courreges-Anglas
On Sat, Jun 09 2018, Klemens Nanni  wrote:
> On Fri, Jun 08, 2018 at 11:55:45PM +0200, Jeremie Courreges-Anglas wrote:
>> I'd prefer:
>> 
>>  if [ "$$REPLY" != N ]; then \
>> 
>> so that by default we keep the current behavior.  I think it's good to
>> push people to check patch comments that might not be accurate any more.
> Fair point.
>
> I went for 'n' so the capital yes equivalent indicates the default reply.

ok jca@

> Index: bsd.port.mk
> ===
> RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
> retrieving revision 1.1414
> diff -u -p -r1.1414 bsd.port.mk
> --- bsd.port.mk   4 Jun 2018 06:14:56 -   1.1414
> +++ bsd.port.mk   8 Jun 2018 22:30:32 -
> @@ -2362,11 +2362,12 @@ update-patches:
>   PATCH_LIST='${PATCH_LIST}' DIFF_ARGS='${DIFF_ARGS}' \
>   DISTORIG=${DISTORIG} PATCHORIG=${PATCHORIG} \
>   ${_PERLSCRIPT}/update-patches`; \
> - case $$toedit in "");; \
> - *) read i?'edit patches: '; \
> - cd ${PATCHDIR} && $${VISUAL:-$${EDITOR:-/usr/bin/vi}} $$toedit;; esac
> -
> -
> + if [ -n "$$toedit" ]; then \
> + read -r REPLY?'edit patches? [Yn]: '; \
> + if [ "$$REPLY" != n ]; then \
> + cd ${PATCHDIR} && $${VISUAL:-$${EDITOR:-/usr/bin/vi}} 
> $$toedit; \
> + fi; \
> + fi
>  
>  .endif # IGNORECMD
>  
>

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



Re: bsd.port.mk: fix update-patches target to honor user reply

2018-06-08 Thread Klemens Nanni
On Fri, Jun 08, 2018 at 11:55:45PM +0200, Jeremie Courreges-Anglas wrote:
> I'd prefer:
> 
>   if [ "$$REPLY" != N ]; then \
> 
> so that by default we keep the current behavior.  I think it's good to
> push people to check patch comments that might not be accurate any more.
Fair point.

I went for 'n' so the capital yes equivalent indicates the default reply.

Index: bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1414
diff -u -p -r1.1414 bsd.port.mk
--- bsd.port.mk 4 Jun 2018 06:14:56 -   1.1414
+++ bsd.port.mk 8 Jun 2018 22:30:32 -
@@ -2362,11 +2362,12 @@ update-patches:
PATCH_LIST='${PATCH_LIST}' DIFF_ARGS='${DIFF_ARGS}' \
DISTORIG=${DISTORIG} PATCHORIG=${PATCHORIG} \
${_PERLSCRIPT}/update-patches`; \
-   case $$toedit in "");; \
-   *) read i?'edit patches: '; \
-   cd ${PATCHDIR} && $${VISUAL:-$${EDITOR:-/usr/bin/vi}} $$toedit;; esac
-
-
+   if [ -n "$$toedit" ]; then \
+   read -r REPLY?'edit patches? [Yn]: '; \
+   if [ "$$REPLY" != n ]; then \
+   cd ${PATCHDIR} && $${VISUAL:-$${EDITOR:-/usr/bin/vi}} 
$$toedit; \
+   fi; \
+   fi
 
 .endif # IGNORECMD
 



CVS: cvs.openbsd.org: ports

2018-06-08 Thread Jeremie Courreges-Anglas
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2018/06/08 16:19:20

Modified files:
editors/emacs  : Makefile distinfo 
editors/emacs/patches: patch-Makefile_in patch-configure 
   patch-lisp_files_el patch-lisp_vc_vc_el 
editors/emacs/pkg: PLIST 

Log message:
Update to emacs-26.1

Announcement and main user-visible changes:
https://lists.gnu.org/archive/html/info-gnu/2018-05/msg00014.html

Many thanks to all the folks who tested the pretest and rc tarballs.
Release tested by Gregoire Jadi, Markus Hennecke, krw@ and solene@ on
amd64, sparc64, powerpc, armv7 and arm64.  ok krw@ solene@



Re: bsd.port.mk: fix update-patches target to honor user reply

2018-06-08 Thread Jeremie Courreges-Anglas
On Fri, Jun 08 2018, Klemens Nanni  wrote:
> The following diff makes `update-patches' ask for 'y' or 'N', accept
> nothing but 'y' as valid confirmation to open the editor and exit
> cleanly otherwise.
>
> Current behaviour is to prompt anything out of the blue and treat every
> reply as confirmation to run an editor on updated patches. The only way
> to get away without editing is ^C (which still updates patches
> successfully but returns 1 anyway).
>
> Someone mentioned a make variable as user knob to override this
> behaviour (unconditionally?); If at all, I'd like to handle this
> separately.
>
> Feedback? OK?
>
> Index: bsd.port.mk
> ===
> RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
> retrieving revision 1.1414
> diff -u -p -r1.1414 bsd.port.mk
> --- bsd.port.mk   4 Jun 2018 06:14:56 -   1.1414
> +++ bsd.port.mk   8 Jun 2018 21:02:37 -
> @@ -2362,11 +2362,12 @@ update-patches:
>   PATCH_LIST='${PATCH_LIST}' DIFF_ARGS='${DIFF_ARGS}' \
>   DISTORIG=${DISTORIG} PATCHORIG=${PATCHORIG} \
>   ${_PERLSCRIPT}/update-patches`; \
> - case $$toedit in "");; \
> - *) read i?'edit patches: '; \
> - cd ${PATCHDIR} && $${VISUAL:-$${EDITOR:-/usr/bin/vi}} $$toedit;; esac
> -
> -
> + if [ -n "$$toedit" ]; then \
> + read -r REPLY?'edit patches? [yN]: '; \
> + if [ "$$REPLY" = y ]; then \

I'd prefer:

if [ "$$REPLY" != N ]; then \

so that by default we keep the current behavior.  I think it's good to
push people to check patch comments that might not be accurate any more.

> + cd ${PATCHDIR} && $${VISUAL:-$${EDITOR:-/usr/bin/vi}} 
> $$toedit; \
> + fi; \
> + fi
>  
>  .endif # IGNORECMD
>  
>

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



bsd.port.mk: fix update-patches target to honor user reply

2018-06-08 Thread Klemens Nanni
The following diff makes `update-patches' ask for 'y' or 'N', accept
nothing but 'y' as valid confirmation to open the editor and exit
cleanly otherwise.

Current behaviour is to prompt anything out of the blue and treat every
reply as confirmation to run an editor on updated patches. The only way
to get away without editing is ^C (which still updates patches
successfully but returns 1 anyway).

Someone mentioned a make variable as user knob to override this
behaviour (unconditionally?); If at all, I'd like to handle this
separately.

Feedback? OK?

Index: bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1414
diff -u -p -r1.1414 bsd.port.mk
--- bsd.port.mk 4 Jun 2018 06:14:56 -   1.1414
+++ bsd.port.mk 8 Jun 2018 21:02:37 -
@@ -2362,11 +2362,12 @@ update-patches:
PATCH_LIST='${PATCH_LIST}' DIFF_ARGS='${DIFF_ARGS}' \
DISTORIG=${DISTORIG} PATCHORIG=${PATCHORIG} \
${_PERLSCRIPT}/update-patches`; \
-   case $$toedit in "");; \
-   *) read i?'edit patches: '; \
-   cd ${PATCHDIR} && $${VISUAL:-$${EDITOR:-/usr/bin/vi}} $$toedit;; esac
-
-
+   if [ -n "$$toedit" ]; then \
+   read -r REPLY?'edit patches? [yN]: '; \
+   if [ "$$REPLY" = y ]; then \
+   cd ${PATCHDIR} && $${VISUAL:-$${EDITOR:-/usr/bin/vi}} 
$$toedit; \
+   fi; \
+   fi
 
 .endif # IGNORECMD
 



CVS: cvs.openbsd.org: ports

2018-06-08 Thread Frederic Cambus
CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2018/06/08 14:44:48

Modified files:
net/libmaxminddb: Makefile distinfo 

Log message:
Update GeoLite2 databases to latest version.



CVS: cvs.openbsd.org: ports

2018-06-08 Thread Denis Fondras
CVSROOT:/cvs
Module name:ports
Changes by: de...@cvs.openbsd.org   2018/06/08 14:32:16

Modified files:
x11/freerdp: Makefile 
Added files:
x11/freerdp/patches: patch-libfreerdp_core_nla_c 

Log message:
Fix failure to connect with latest CredSSP protocol version.

With inputs from landry@ and jca@.

OK landry@, benoit@, jca@



Re: NEW: x11/kde-applications/gwenview

2018-06-08 Thread Rafael Sadowski
On Fri Jun 08, 2018 at 12:41:29PM -0300, Elias M. Mariani wrote:
> Tested OK.
> Did not test the thumbnailer function.
> Opening SVG, PNG and JPG works.
> The application works.
> The only "error" that might be significant is:
> "kf5.kservice.services: KServiceTypeTrader: serviceType "ThumbCreator"
> not found"
> But I was testing outside a real KDE desktop so maybe the lack of
> kinit or something affected the test.
> No reasons to delay the switch.
> 
> Almost forgot: This plugin uses libkdcraw-17.12.3 but i wouldn't
> consider that library tested (but compiles OK and didn't find any
> errors), I saw a long list of mails regarding that library, I imagine
> that you modified several bits of the Makefile.
> 
> Cheers.
> Elias.
> 

Elias, thank you for testing. We have to do this in one step with
digikam to complete the KDE4-KDE5 circle.

1.) Update opencv:
https://marc.info/?l=openbsd-ports=152417178424432=2

2.) Import x11/kde-applications/libkdcraw
https://marc.info/?l=openbsd-ports=152498913400726=2

3.) Import x11/digikam
https://marc.info/?l=openbsd-ports=152417135524287=2

4.) Import x11/kde-applications/gwenview
https://marc.info/?l=openbsd-ports=152551895425877=2

5.) Unhook (Until we're finished with x11/kde-applications I won't
delete nothing):
- x11/kde4/graphics-thumbnailers (I see no consumers)
- x11/kde4/gwenview
- x11/kde4/libkdcraw

6.) Adjust meta/kde4
7.) Unhook and remove x11/digikam-kde4
8.) Hook all imported ports

I really *hope* we can work this out soon but we don't get an ok until
espie@ has tested it. He has another priority queue than me ;)

btw Testing digikam should be easy, you need only
x11/kde-applications/libkdcraw and x11/digikam.



Re: new: www/hugo

2018-06-08 Thread fredl

Fixed WANTLIB. Thanks solene@ !


On 06/08/18 10:57, fredl wrote:

Hey,

attached is the new version with golang/dep.

Do you have any more feedback? :) And thank you for
your help so far!

fredl


On 06/07/18 18:14, fredl wrote:

This sounds great! Thank you for this hint!

I will keep you updated!


On 07.06.2018, at 18:10, Solene Rapenne  wrote:


fredl writes:


I just took a look. These are a LOT of extra libraries.

Is the first version really not ok? The version with the binaries?
I can try to get this ~20 extra libraries working, but alone the 
extra effort for the version control seems odd in the long run.


fredl


On 07.06.2018, at 17:25, fredl  wrote:

Ok thanks!


On 07.06.2018, at 17:23, Solene Rapenne  wrote:


fredl writes:


On 06/07/18 14:20, Solene Rapenne wrote:
fredl writes:


Hey,

thanks for this quick review!

I will look at this and answer with a new .tgz once I have it 
done.


thanks again!
fredl


On 07.06.2018, at 13:18, Solene Rapenne  wrote:


fredl writes:


Hey,

attached is a new port, www/hugo. hugo is a static website 
generator.


---
pkg/DESCR:

Hugo is a static HTML and CSS website generator written in Go.
It is optimized for speed, ease of use, and configurability.
Hugo takes a directory with content and templates and renders
them into a full HTML website.

Hugo relies on Markdown files with front matter for metadata.

---

It should working on am64 and i386.
I've only been able to test on amd64, if someone could test 
it on

i386, it would be
great!

Ok?

fredl

Hello

Your port use a binary downloaded from github, it's not the 
way to

go. It shoud be built from sources.

You should also change the order of variables in your 
makefile, you can
check the file infrastructure/templates/Makefile.template 
from the ports

tree as an example for reordering correctly.

for restricting to supported archs you can use this line.

ONLY_FOR_ARCHS =    ${GO_ARCHS}

Hey,

thanks again!

This version builts from sources + I added man-pages.
Is this a better version?

fredl
portcheck is happy and the makefile looks better but your port is 
using

"go get" to download files, it's not allowed and doesn't even work
because the user building port is by default prohibited to get 
network

access (when you use the dedicated ports building user).

If your port need extra libraries, then you should make ports for 
those
libraries and add them as LIB_DEPENDS to www/hugo. If the extra 
files

are assets or static files, it can be downloaded within the port by
adding them to DISTFILES (you can find an example in x11/stumpwm).
I've been speaking about this with abieber@ and sthen@, one way to 
go is

to fetch the sources on your computer, use the software dep
(https://github.com/golang/dep) with "dep ensure" to fetch all the
libraries needed and store it in some directory named "vendor". Then 
you
can create a tarball of the whole sources needed (exclude the .git 
files
because it's not useful) and host it somewhere, and use this tarball 
for

your port.






hugo.tgz
Description: Binary data


CVS: cvs.openbsd.org: ports

2018-06-08 Thread Matthias Kilian
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2018/06/08 13:42:40

Modified files:
lang/php/5.6   : Makefile 
lang/php/5.6/pkg: PLIST-apache PLIST-main 
lang/php/7.0   : Makefile 
lang/php/7.0/pkg: PLIST-apache PLIST-main 

Log message:
Move share/examples/php-${PV}/php.conf from -main to -apache.

This fixes the /var/www/conf/modules.sample.php-${PV}.conf (which
was just a copy of the apache module itself).

Bump -main and -apache.

Adjust @conflict markers (reminded by sthen@).

ok sthen@



Re: [freerdp] fix nla: don't use server version

2018-06-08 Thread Jeremie Courreges-Anglas
On Fri, Jun 08 2018, Denis Fondras  wrote:
> freerdp-2.0.0rc1 fails to connect with the latest RDP protocol. Developer
> provides a quick fix :
> https://github.com/FreeRDP/FreeRDP/commit/e7ae3f6babc881d893411a5ada9156abe8525b2f
>
> Fix our port.

Indeed, ok jca@.  Can you please add the commit url in the patch?

> Denis
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/freerdp/Makefile,v
> retrieving revision 1.31
> diff -u -p -r1.31 Makefile
> --- Makefile  28 Apr 2018 19:20:17 -  1.31
> +++ Makefile  8 Jun 2018 18:00:29 -
> @@ -6,6 +6,7 @@ BROKEN-hppa = undefined reference to __
>  COMMENT =open source client for Windows Terminal Server
>  DISTNAME =   freerdp-2.0.0-rc1
>  PKGNAME =freerdp-2.0.0rc1
> +REVISION =   0
>  CATEGORIES = x11 net
>  
>  SHARED_LIBS +=  freerdp-client2   0.0 # 2.0
> Index: patches/patch-libfreerdp_core_nla_c
> ===
> RCS file: patches/patch-libfreerdp_core_nla_c
> diff -N patches/patch-libfreerdp_core_nla_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-libfreerdp_core_nla_c   8 Jun 2018 18:00:29 -
> @@ -0,0 +1,25 @@
> +$OpenBSD$
> +
> +Index: libfreerdp/core/nla.c
> +--- libfreerdp/core/nla.c.orig
>  libfreerdp/core/nla.c
> +@@ -1663,14 +1663,18 @@ BOOL nla_send(rdpNla* nla)
> + static int nla_decode_ts_request(rdpNla* nla, wStream* s)
> + {
> + int length;
> ++UINT32 version = 0;
> + 
> + /* TSRequest */
> + if (!ber_read_sequence_tag(s, ) ||
> + !ber_read_contextual_tag(s, 0, , TRUE) ||
> +-!ber_read_integer(s, >version))
> ++!ber_read_integer(s, ))
> + {
> + return -1;
> + }
> ++
> ++if (version < nla->version)
> ++nla->version = version;
> + 
> + /* [1] negoTokens (NegoData) */
> + if (ber_read_contextual_tag(s, 1, , TRUE) != FALSE)
>

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



[freerdp] fix nla: don't use server version

2018-06-08 Thread Denis Fondras
freerdp-2.0.0rc1 fails to connect with the latest RDP protocol. Developer
provides a quick fix :
https://github.com/FreeRDP/FreeRDP/commit/e7ae3f6babc881d893411a5ada9156abe8525b2f

Fix our port.

Denis

Index: Makefile
===
RCS file: /cvs/ports/x11/freerdp/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile28 Apr 2018 19:20:17 -  1.31
+++ Makefile8 Jun 2018 18:00:29 -
@@ -6,6 +6,7 @@ BROKEN-hppa =   undefined reference to __
 COMMENT =  open source client for Windows Terminal Server
 DISTNAME = freerdp-2.0.0-rc1
 PKGNAME =  freerdp-2.0.0rc1
+REVISION = 0
 CATEGORIES =   x11 net
 
 SHARED_LIBS +=  freerdp-client2   0.0 # 2.0
Index: patches/patch-libfreerdp_core_nla_c
===
RCS file: patches/patch-libfreerdp_core_nla_c
diff -N patches/patch-libfreerdp_core_nla_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-libfreerdp_core_nla_c 8 Jun 2018 18:00:29 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Index: libfreerdp/core/nla.c
+--- libfreerdp/core/nla.c.orig
 libfreerdp/core/nla.c
+@@ -1663,14 +1663,18 @@ BOOL nla_send(rdpNla* nla)
+ static int nla_decode_ts_request(rdpNla* nla, wStream* s)
+ {
+   int length;
++  UINT32 version = 0;
+ 
+   /* TSRequest */
+   if (!ber_read_sequence_tag(s, ) ||
+   !ber_read_contextual_tag(s, 0, , TRUE) ||
+-  !ber_read_integer(s, >version))
++  !ber_read_integer(s, ))
+   {
+   return -1;
+   }
++
++  if (version < nla->version)
++  nla->version = version;
+ 
+   /* [1] negoTokens (NegoData) */
+   if (ber_read_contextual_tag(s, 1, , TRUE) != FALSE)



Re: about php-apache

2018-06-08 Thread Stuart Henderson
Thanks - please bump the @conflict in the PLIST-apache files, <=5.6.36p8 
and <=7.0.30p8, then it's ok.

--
Sent from a phone, apologies for poor formatting.
On 8 June 2018 19:04:14 Matthias Kilian  wrote:


Hi,

On Fri, Jun 08, 2018 at 01:08:40PM -0300, Elias M. Mariani wrote:

I found that in /var/www/conf/modules.example is a binary file named
php-7.0.conf.
I'm guessing that the content is the result of apxs2, not testing that
binary anyways...
Shouldn't be equal to the old file with the module extension
configuration? I mean... text, not binary...
I think there is a example in /usr/local/share/examples/php-7.0/php.conf


That example did miss the move from -main to -apache, and the result is
that the module itself is installed into /var/www/conf/modules.example.

The diff below should fix this problem (still untested at the
moment).

CIao,
Kili

Index: 5.6/Makefile
===
RCS file: /cvs/ports/lang/php/5.6/Makefile,v
retrieving revision 1.76
diff -u -p -r1.76 Makefile
--- 5.6/Makefile5 Jun 2018 12:50:29 -   1.76
+++ 5.6/Makefile8 Jun 2018 17:55:26 -
@@ -3,6 +3,8 @@
PV= 5.6
V=  ${PV}.36
REVISION=   8
+REVISION-main= 9
+REVISION-apache=   9

MASTER_SITES0=  https://download.suhosin.org/

Index: 5.6/pkg/PLIST-apache
===
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-apache,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-apache
--- 5.6/pkg/PLIST-apache27 May 2018 19:54:17 -  1.1
+++ 5.6/pkg/PLIST-apache8 Jun 2018 17:55:26 -
@@ -5,4 +5,5 @@
@conflict php-apache->=5.6,<5.7
lib/php-${PV}/libphp5.so
@sample ${MODPHP_CONFIG_PATH}/modules.sample/
+share/examples/php-${PV}/php.conf
@sample ${MODPHP_CONFIG_PATH}/modules.sample/php-${PV}.conf
Index: 5.6/pkg/PLIST-main
===
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-main,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST-main
--- 5.6/pkg/PLIST-main  5 Jun 2018 12:50:29 -   1.19
+++ 5.6/pkg/PLIST-main  8 Jun 2018 17:55:26 -
@@ -37,7 +37,6 @@ share/examples/php-${PV}/opcache.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/opcache.ini
share/examples/php-${PV}/php-fpm.conf
@sample ${SYSCONFDIR}/php-fpm.conf
-share/examples/php-${PV}/php.conf
share/examples/php-${PV}/php.ini-development
share/examples/php-${PV}/php.ini-production
@sample ${SYSCONFDIR}/php-${PV}.ini
Index: 7.0/Makefile
===
RCS file: /cvs/ports/lang/php/7.0/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- 7.0/Makefile5 Jun 2018 12:50:29 -   1.59
+++ 7.0/Makefile8 Jun 2018 17:55:26 -
@@ -3,6 +3,8 @@
PV= 7.0
V=  ${PV}.30
REVISION=   8
+REVISION-main= 9
+REVISION-apache=   9

BUILD_DEPENDS+= devel/bison

Index: 7.0/pkg/PLIST-apache
===
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-apache,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-apache
--- 7.0/pkg/PLIST-apache27 May 2018 19:54:17 -  1.1
+++ 7.0/pkg/PLIST-apache8 Jun 2018 17:55:26 -
@@ -5,4 +5,5 @@
@conflict php-apache->=7.0,<7.1
lib/php-${PV}/libphp7.so
@sample ${MODPHP_CONFIG_PATH}/modules.sample/
+share/examples/php-${PV}/php.conf
@sample ${MODPHP_CONFIG_PATH}/modules.sample/php-${PV}.conf
Index: 7.0/pkg/PLIST-main
===
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-main,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST-main
--- 7.0/pkg/PLIST-main  5 Jun 2018 12:50:29 -   1.15
+++ 7.0/pkg/PLIST-main  8 Jun 2018 17:55:26 -
@@ -36,7 +36,6 @@ share/examples/php-${PV}/opcache.ini
@sample ${SYSCONFDIR}/php-${PV}.sample/opcache.ini
share/examples/php-${PV}/php-fpm.conf
@sample ${SYSCONFDIR}/php-fpm.conf
-share/examples/php-${PV}/php.conf
share/examples/php-${PV}/php.ini-development
share/examples/php-${PV}/php.ini-production
@sample ${SYSCONFDIR}/php-${PV}.ini






Re: about php-apache

2018-06-08 Thread Matthias Kilian
Hi,

On Fri, Jun 08, 2018 at 01:08:40PM -0300, Elias M. Mariani wrote:
> I found that in /var/www/conf/modules.example is a binary file named
> php-7.0.conf.
> I'm guessing that the content is the result of apxs2, not testing that
> binary anyways...
> Shouldn't be equal to the old file with the module extension
> configuration? I mean... text, not binary...
> I think there is a example in /usr/local/share/examples/php-7.0/php.conf

That example did miss the move from -main to -apache, and the result is
that the module itself is installed into /var/www/conf/modules.example.

The diff below should fix this problem (still untested at the
moment).

CIao,
Kili

Index: 5.6/Makefile
===
RCS file: /cvs/ports/lang/php/5.6/Makefile,v
retrieving revision 1.76
diff -u -p -r1.76 Makefile
--- 5.6/Makefile5 Jun 2018 12:50:29 -   1.76
+++ 5.6/Makefile8 Jun 2018 17:55:26 -
@@ -3,6 +3,8 @@
 PV=5.6
 V= ${PV}.36
 REVISION=  8
+REVISION-main= 9
+REVISION-apache=   9
 
 MASTER_SITES0= https://download.suhosin.org/
 
Index: 5.6/pkg/PLIST-apache
===
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-apache,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-apache
--- 5.6/pkg/PLIST-apache27 May 2018 19:54:17 -  1.1
+++ 5.6/pkg/PLIST-apache8 Jun 2018 17:55:26 -
@@ -5,4 +5,5 @@
 @conflict php-apache->=5.6,<5.7
 lib/php-${PV}/libphp5.so
 @sample ${MODPHP_CONFIG_PATH}/modules.sample/
+share/examples/php-${PV}/php.conf
 @sample ${MODPHP_CONFIG_PATH}/modules.sample/php-${PV}.conf
Index: 5.6/pkg/PLIST-main
===
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-main,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST-main
--- 5.6/pkg/PLIST-main  5 Jun 2018 12:50:29 -   1.19
+++ 5.6/pkg/PLIST-main  8 Jun 2018 17:55:26 -
@@ -37,7 +37,6 @@ share/examples/php-${PV}/opcache.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/opcache.ini
 share/examples/php-${PV}/php-fpm.conf
 @sample ${SYSCONFDIR}/php-fpm.conf
-share/examples/php-${PV}/php.conf
 share/examples/php-${PV}/php.ini-development
 share/examples/php-${PV}/php.ini-production
 @sample ${SYSCONFDIR}/php-${PV}.ini
Index: 7.0/Makefile
===
RCS file: /cvs/ports/lang/php/7.0/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- 7.0/Makefile5 Jun 2018 12:50:29 -   1.59
+++ 7.0/Makefile8 Jun 2018 17:55:26 -
@@ -3,6 +3,8 @@
 PV=7.0
 V= ${PV}.30
 REVISION=  8
+REVISION-main= 9
+REVISION-apache=   9
 
 BUILD_DEPENDS+=devel/bison
 
Index: 7.0/pkg/PLIST-apache
===
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-apache,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-apache
--- 7.0/pkg/PLIST-apache27 May 2018 19:54:17 -  1.1
+++ 7.0/pkg/PLIST-apache8 Jun 2018 17:55:26 -
@@ -5,4 +5,5 @@
 @conflict php-apache->=7.0,<7.1
 lib/php-${PV}/libphp7.so
 @sample ${MODPHP_CONFIG_PATH}/modules.sample/
+share/examples/php-${PV}/php.conf
 @sample ${MODPHP_CONFIG_PATH}/modules.sample/php-${PV}.conf
Index: 7.0/pkg/PLIST-main
===
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-main,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST-main
--- 7.0/pkg/PLIST-main  5 Jun 2018 12:50:29 -   1.15
+++ 7.0/pkg/PLIST-main  8 Jun 2018 17:55:26 -
@@ -36,7 +36,6 @@ share/examples/php-${PV}/opcache.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/opcache.ini
 share/examples/php-${PV}/php-fpm.conf
 @sample ${SYSCONFDIR}/php-fpm.conf
-share/examples/php-${PV}/php.conf
 share/examples/php-${PV}/php.ini-development
 share/examples/php-${PV}/php.ini-production
 @sample ${SYSCONFDIR}/php-${PV}.ini



Re: CVS: cvs.openbsd.org: ports

2018-06-08 Thread Paul de Weerd
On Fri, Jun 08, 2018 at 11:30:16AM -0600, James Turner wrote:
| CVSROOT:  /cvs
| Module name:  ports
| Changes by:   jtur...@cvs.openbsd.org 2018/06/08 11:30:16
| 
| Modified files:
|   www/kcgi   : Makefile 
| Added files:
|   www/kcgi/patches: patch-kcgi_c 
| 
| Log message:
| Fix bug in kutil_urlencode on signed char platforms where the top bit
| of the character is set. Port patch from Paul de Weerd.

Bug found and fix (i.e. all the hard work) by Ross L Richardson.

Thanks for committing, James!

Paul

-- 
>[<++>-]<+++.>+++[<-->-]<.>+++[<+
+++>-]<.>++[<>-]<+.--.[-]
 http://www.weirdnet.nl/ 



CVS: cvs.openbsd.org: ports

2018-06-08 Thread James Turner
CVSROOT:/cvs
Module name:ports
Changes by: jtur...@cvs.openbsd.org 2018/06/08 11:30:16

Modified files:
www/kcgi   : Makefile 
Added files:
www/kcgi/patches: patch-kcgi_c 

Log message:
Fix bug in kutil_urlencode on signed char platforms where the top bit
of the character is set. Port patch from Paul de Weerd.



CVS: cvs.openbsd.org: ports

2018-06-08 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/06/08 10:48:26

Modified files:
www/firefox-esr: Tag: OPENBSD_6_3 Makefile distinfo 

Log message:
MFC: Update to firefox-esr 52.8.1.

See https://www.mozilla.org/en-US/firefox/52.8.1/releasenotes/
Fixes https://www.mozilla.org/en-US/security/advisories/mfsa2018-14/
-stable package at the usual spot



CVS: cvs.openbsd.org: ports

2018-06-08 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/06/08 10:46:21

Modified files:
www/mozilla-firefox: Tag: OPENBSD_6_3 Makefile distinfo 

Log message:
MFC: Update to firefox 60.0.2.

See https://www.mozilla.org/en-US/firefox/60.0.2/releasenotes/
Fixes https://www.mozilla.org/en-US/security/advisories/mfsa2018-14/
-stable packages at the usual spot.



CVS: cvs.openbsd.org: ports

2018-06-08 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/06/08 10:45:31

Modified files:
www/mozilla-firefox: Makefile distinfo 
www/firefox-i18n: Makefile.inc distinfo 

Log message:
Update to firefox 60.0.2.

See https://www.mozilla.org/en-US/firefox/60.0.2/releasenotes/
Fixes https://www.mozilla.org/en-US/security/advisories/mfsa2018-14/



CVS: cvs.openbsd.org: ports

2018-06-08 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/06/08 10:43:18

Modified files:
www/firefox-esr: Makefile distinfo 
www/firefox-esr-i18n: Makefile.inc distinfo 

Log message:
Update to firefox-esr 52.8.1.

See https://www.mozilla.org/en-US/firefox/52.8.1/releasenotes/
Fixes https://www.mozilla.org/en-US/security/advisories/mfsa2018-14/



about php-apache

2018-06-08 Thread Elias M. Mariani
I found that in /var/www/conf/modules.example is a binary file named
php-7.0.conf.
I'm guessing that the content is the result of apxs2, not testing that
binary anyways...
Shouldn't be equal to the old file with the module extension
configuration? I mean... text, not binary...
I think there is a example in /usr/local/share/examples/php-7.0/php.conf

Cheers.
Elias.



Re: UPDATE: emulators/ppsspp

2018-06-08 Thread Jan Beich
> Here's an update to ppsspp-1.6.2.

Do you plan to add libretro flavor a la mgba/nestopia?

https://github.com/hrydgard/ppsspp/pull/10780

>  LIB_DEPENDS =archivers/snappy \
> - archivers/libzip \

Have you tried the following?

  CONFIGURE_ARGS += -DUSE_SYSTEM_LIBZIP=ON

http://github.com/hrydgard/ppsspp/commit/59d6cc12f2c6



Re: NEW: x11/kde-applications/gwenview

2018-06-08 Thread Elias M. Mariani
Tested OK.
Did not test the thumbnailer function.
Opening SVG, PNG and JPG works.
The application works.
The only "error" that might be significant is:
"kf5.kservice.services: KServiceTypeTrader: serviceType "ThumbCreator"
not found"
But I was testing outside a real KDE desktop so maybe the lack of
kinit or something affected the test.
No reasons to delay the switch.

Almost forgot: This plugin uses libkdcraw-17.12.3 but i wouldn't
consider that library tested (but compiles OK and didn't find any
errors), I saw a long list of mails regarding that library, I imagine
that you modified several bits of the Makefile.

Cheers.
Elias.



Re: x11/kde-applications/analitza ./kalgebra ./cantor

2018-06-08 Thread Vadim Zhukov
8 июня 2018 г. 17:00:20 GMT+03:00, "Elias M. Mariani"  
пишет:
>analitza compiles OK.
>Its a library so the test is done by the use of kalgebra and cantor.
>
>kalgebra:
>calgebra worked OK.
>kalgebramobile is missing a run dependency:
>- qtgraphicaleffects
>And it gives this warning that may be good to check out:
>"JIT is disabled for QML. Property bindings and animations will be
>very slow. Visit https://wiki.qt.io/V4 to learn about possible
>solutions for your platform."
>And some random errors from qtsvg and others, but nothing unusual about
>that...
>The application works OK, at least the calculator/analyzer and the 2D
>function plotter.
>It really works very slow, that is why maybe you should look about
>that JIT/QML error.
>
>cantor:
>Tested using kalgebra, works OK.
>
>Cheers.
>Elias.

That QML error is there because QML (or, more technically, QtScript) engine is 
not W^X safe. Usually that means that you have to add USE_WXNEEDED=yes to 
Makefile of port running QML-featured executable, unfortunately.
-- 
  WBR,
Vadim Zhukov



CVS: cvs.openbsd.org: ports

2018-06-08 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/06/08 08:59:33

Modified files:
sysutils/awscli: Makefile distinfo 

Log message:
Update to awscli-1.15.34.



CVS: cvs.openbsd.org: ports

2018-06-08 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/06/08 08:59:23

Modified files:
net/py-botocore: Makefile distinfo 

Log message:
Update to py-botocore-1.10.34.



CVS: cvs.openbsd.org: ports

2018-06-08 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/06/08 08:55:49

Modified files:
net/py-boto3   : Makefile distinfo 

Log message:
Update to py-boto3-1.7.34.



CVS: cvs.openbsd.org: ports

2018-06-08 Thread Gonzalo L . Rodriguez
CVSROOT:/cvs
Module name:ports
Changes by: gonz...@cvs.openbsd.org 2018/06/08 08:46:21

Modified files:
www/nextcloud  : Makefile distinfo 
www/nextcloud/pkg: PLIST README 

Log message:
Update for Nextcloud to 13.0.3:

https://nextcloud.com/changelog/

While here, I moved the httpd(8) to the README as we did on owncloud.

Also we kill the last file messing with the file check, also the occ,
thanks abieber@.

OK abieber@



CVS: cvs.openbsd.org: ports

2018-06-08 Thread Kevin Lo
CVSROOT:/cvs
Module name:ports
Changes by: ke...@cvs.openbsd.org   2018/06/08 08:25:26

Modified files:
devel  : Makefile 

Log message:
+riscv-elf



CVS: cvs.openbsd.org: ports

2018-06-08 Thread Kevin Lo
CVSROOT:/cvs
Module name:ports
Changes by: ke...@cvs.openbsd.org   2018/06/08 08:24:32

Log message:
GNU cross compiler suite, configured for the riscv64 target.

ok bentley@

Status:

Vendor Tag: kevlo
Release Tags:   kevlo_20180608

N ports/devel/riscv-elf/Makefile
N ports/devel/riscv-elf/Makefile.inc
N ports/devel/riscv-elf/gcc/Makefile
N ports/devel/riscv-elf/gcc/distinfo
N ports/devel/riscv-elf/gcc/patches/patch-Makefile_in
N ports/devel/riscv-elf/gcc/patches/patch-gcc_Makefile_in
N ports/devel/riscv-elf/gcc/patches/patch-gcc_configure
N ports/devel/riscv-elf/gcc/patches/patch-libiberty_Makefile_in
N ports/devel/riscv-elf/gcc/patches/patch-libgcc_Makefile_in
N ports/devel/riscv-elf/gcc/patches/patch-libcc1_connection_cc
N ports/devel/riscv-elf/gcc/pkg/PLIST
N ports/devel/riscv-elf/gcc/pkg/DESCR
N ports/devel/riscv-elf/binutils/Makefile
N ports/devel/riscv-elf/binutils/distinfo
N ports/devel/riscv-elf/binutils/patches/patch-bfd_doc_Makefile_in
N ports/devel/riscv-elf/binutils/patches/patch-binutils_doc_Makefile_in
N ports/devel/riscv-elf/binutils/patches/patch-gas_doc_Makefile_in
N ports/devel/riscv-elf/binutils/patches/patch-gprof_Makefile_in
N ports/devel/riscv-elf/binutils/patches/patch-ld_Makefile_in
N ports/devel/riscv-elf/binutils/patches/patch-libiberty_Makefile_in
N ports/devel/riscv-elf/binutils/pkg/PLIST
N ports/devel/riscv-elf/binutils/pkg/DESCR
N ports/devel/riscv-elf/newlib/Makefile
N ports/devel/riscv-elf/newlib/distinfo
N ports/devel/riscv-elf/newlib/pkg/DESCR
N ports/devel/riscv-elf/newlib/pkg/PLIST

No conflicts created by this import



Re: x11/kde-applications/analitza ./kalgebra ./cantor

2018-06-08 Thread Elias M. Mariani
A remark that I forgot to mention:
Is really bizarre that the old analitza has so many dependencies that
was faster to compile the new analitza and install that installing the
old one from packages...
Go KDE5.

2018-06-08 11:00 GMT-03:00 Elias M. Mariani :
> analitza compiles OK.
> Its a library so the test is done by the use of kalgebra and cantor.
>
> kalgebra:
> calgebra worked OK.
> kalgebramobile is missing a run dependency:
> - qtgraphicaleffects
> And it gives this warning that may be good to check out:
> "JIT is disabled for QML. Property bindings and animations will be
> very slow. Visit https://wiki.qt.io/V4 to learn about possible
> solutions for your platform."
> And some random errors from qtsvg and others, but nothing unusual about 
> that...
> The application works OK, at least the calculator/analyzer and the 2D
> function plotter.
> It really works very slow, that is why maybe you should look about
> that JIT/QML error.
>
> cantor:
> Tested using kalgebra, works OK.
>
> Cheers.
> Elias.



x11/kde-applications/analitza ./kalgebra ./cantor

2018-06-08 Thread Elias M. Mariani
analitza compiles OK.
Its a library so the test is done by the use of kalgebra and cantor.

kalgebra:
calgebra worked OK.
kalgebramobile is missing a run dependency:
- qtgraphicaleffects
And it gives this warning that may be good to check out:
"JIT is disabled for QML. Property bindings and animations will be
very slow. Visit https://wiki.qt.io/V4 to learn about possible
solutions for your platform."
And some random errors from qtsvg and others, but nothing unusual about that...
The application works OK, at least the calculator/analyzer and the 2D
function plotter.
It really works very slow, that is why maybe you should look about
that JIT/QML error.

cantor:
Tested using kalgebra, works OK.

Cheers.
Elias.



Re: UPDATE: Nextcloud-13.0.3

2018-06-08 Thread Aaron Bieber
On Fri, Jun 08, 2018 at 08:31:39AM +0200, Gonzalo L. Rodriguez wrote:
> Hello,
> 
> Update for Nextcloud to 13.0.3:
> 
> https://nextcloud.com/changelog/
> 
> While here, I moved the httpd(8) to the README as we did on owncloud.
> 
> OK? Comments?

Builds / installs / runs fine here. IMO we should avoid modifying the
signed files (info.xml and occ). Apologies if it's been discussed
before, but I am not sure the changes are worth the "compromised"
integrity.

Maybe a README entry regarding a "php" binary would work for the occ
script. Perhaps there is another way to disable auto updates (I will
poke around)?

I don't think the above should be an update stopper, so OK abieber@

> 
> Cheers.-
> 
> -- 
> Sending from my toaster.

> Index: Makefile
> ===
> RCS file: /cvs/ports/www/nextcloud/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile  2 Jun 2018 20:58:30 -   1.16
> +++ Makefile  8 Jun 2018 06:29:00 -
> @@ -2,8 +2,7 @@
>  
>  COMMENT= easy and universal access to shared and/or personal 
> files
>  
> -V=   13.0.2
> -REVISION=2
> +V=   13.0.3
>  DISTNAME=nextcloud-${V}
>  EXTRACT_SUFX=.tar.bz2
>  
> @@ -72,7 +71,5 @@ do-install:
>   ${INSTALL_DATA_DIR} ${PREFIX}/conf/modules.sample
>   ${SUBST_CMD} -m 0644 -c ${FILESDIR}/apache-nextcloud.conf.dist.in \
>   ${PREFIX}/conf/modules.sample/apache-nextcloud.conf.dist
> - ${SUBST_CMD} -m 0644 -c ${FILESDIR}/httpd-nextcloud.conf.dist.in \
> - ${PREFIX}/conf/modules.sample/httpd-nextcloud.conf.dist
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/nextcloud/distinfo,v
> retrieving revision 1.10
> diff -u -p -r1.10 distinfo
> --- distinfo  27 Apr 2018 06:24:02 -  1.10
> +++ distinfo  8 Jun 2018 06:29:00 -
> @@ -1,2 +1,2 @@
> -SHA256 (nextcloud-13.0.2.tar.bz2) = 
> c5b5ihpTqfSxRPVTYNh8ictu6Jn+7xz78ppzYhn5xH0=
> -SIZE (nextcloud-13.0.2.tar.bz2) = 44842305
> +SHA256 (nextcloud-13.0.3.tar.bz2) = 
> GDZnVAgA3QRepXgB/t+MooDegrkVgkEqrQfULtcek+Q=
> +SIZE (nextcloud-13.0.3.tar.bz2) = 45128672
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/www/nextcloud/pkg/PLIST,v
> retrieving revision 1.12
> diff -u -p -r1.12 PLIST
> --- pkg/PLIST 17 May 2018 08:57:47 -  1.12
> +++ pkg/PLIST 8 Jun 2018 06:29:03 -
> @@ -1,10 +1,9 @@
>  @comment $OpenBSD: PLIST,v 1.12 2018/05/17 08:57:47 gonzalo Exp $
>  @unexec-delete rm -f ${PREFIX}/conf/modules/httpd-nextcloud.conf
>  @unexec-delete rm -f ${PREFIX}/conf/modules/apache-nextcloud.conf
> +conf/modules.sample/
>  conf/modules.sample/apache-nextcloud.conf.dist
> -@sample ${PREFIX}/conf/modules.sample/apache-nextcloud.conf
> -conf/modules.sample/httpd-nextcloud.conf.dist
> -@sample ${PREFIX}/conf/modules.sample/httpd-nextcloud.conf
> +@sample conf/modules.sample/apache-nextcloud.conf
>  nextcloud/
>  nextcloud/.htaccess.dist
>  @sample nextcloud/.htaccess
> @@ -5929,6 +5928,7 @@ nextcloud/apps/dav/lib/CardDAV/Xml/Group
>  nextcloud/apps/dav/lib/Command/
>  nextcloud/apps/dav/lib/Command/CreateAddressBook.php
>  nextcloud/apps/dav/lib/Command/CreateCalendar.php
> +nextcloud/apps/dav/lib/Command/RemoveInvalidShares.php
>  nextcloud/apps/dav/lib/Command/SyncBirthdayCalendar.php
>  nextcloud/apps/dav/lib/Command/SyncSystemAddressBook.php
>  nextcloud/apps/dav/lib/Comments/
> @@ -9357,14 +9357,8 @@ nextcloud/apps/firstrunwizard/l10n/
>  nextcloud/apps/firstrunwizard/l10n/.gitignore
>  nextcloud/apps/firstrunwizard/l10n/.tx/
>  nextcloud/apps/firstrunwizard/l10n/.tx/config
> -nextcloud/apps/firstrunwizard/l10n/ar.js
> -nextcloud/apps/firstrunwizard/l10n/ar.json
>  nextcloud/apps/firstrunwizard/l10n/ast.js
>  nextcloud/apps/firstrunwizard/l10n/ast.json
> -nextcloud/apps/firstrunwizard/l10n/az.js
> -nextcloud/apps/firstrunwizard/l10n/az.json
> -nextcloud/apps/firstrunwizard/l10n/bg.js
> -nextcloud/apps/firstrunwizard/l10n/bg.json
>  nextcloud/apps/firstrunwizard/l10n/bn_IN.php
>  nextcloud/apps/firstrunwizard/l10n/ca.js
>  nextcloud/apps/firstrunwizard/l10n/ca.json
> @@ -9382,8 +9376,6 @@ nextcloud/apps/firstrunwizard/l10n/el.js
>  nextcloud/apps/firstrunwizard/l10n/el.json
>  nextcloud/apps/firstrunwizard/l10n/en_GB.js
>  nextcloud/apps/firstrunwizard/l10n/en_GB.json
> -nextcloud/apps/firstrunwizard/l10n/eo.js
> -nextcloud/apps/firstrunwizard/l10n/eo.json
>  nextcloud/apps/firstrunwizard/l10n/es.js
>  nextcloud/apps/firstrunwizard/l10n/es.json
>  nextcloud/apps/firstrunwizard/l10n/es_419.js
> @@ -9424,8 +9416,6 @@ nextcloud/apps/firstrunwizard/l10n/et_EE
>  nextcloud/apps/firstrunwizard/l10n/et_EE.json
>  nextcloud/apps/firstrunwizard/l10n/eu.js
>  nextcloud/apps/firstrunwizard/l10n/eu.json
> -nextcloud/apps/firstrunwizard/l10n/fa.js
> 

Re: update mail/hypermail from 2.1.8 to 2.3.0

2018-06-08 Thread Hiltjo Posthuma
On Fri, Jun 08, 2018 at 02:50:57PM +0200, Solene Rapenne wrote:
> 
> Hiltjo Posthuma writes:
> 
> > Hi,
> >
> > This is a stab at updating hypermail to 2.3.0.
> >
> > A few patches are not needed anymore.
> >
> > I'm sure I made some stupid mistakes.
> >
> > Briefly tested on amd64.
> >
> 
> There is no MASTER_SITES defined so we can't download the distfiles.
> 
> Also, I found an extra patch which add patches/patch-configure.orig
> which should be removed.
> 
> Does using the new version requires changes for 2.1.8 users?
> 

Hey,

Thanks for the review.

I don't think the new version requires configuration changes for 2.1.8 users.

Below is an updated patch:


diff --git a/mail/hypermail/Makefile b/mail/hypermail/Makefile
index 606658d13a4..5cfa1d368ad 100644
--- a/mail/hypermail/Makefile
+++ b/mail/hypermail/Makefile
@@ -2,24 +2,27 @@
 
 COMMENT=   generate a cross-referenced HTML mail archive
 
-VERSION=   2.1.8
-DISTNAME=  hypermail-${VERSION}
-REVISION = 1
+VERSION=   2.3.0
+NAME=  hypermail
+DISTNAME=  ${NAME}-${VERSION}
+
 CATEGORIES=mail www
 
 HOMEPAGE=  http://www.hypermail-project.org/
 
-MASTER_SITES=  http://www.linklevel.net/distfiles/
+MASTER_SITES=  ${HOMEPAGE}
 
 LIB_DEPENDS+=  devel/pcre
 
+WRKDIST=   ${WRKDIR}/${NAME}
+
 # GPL
 PERMIT_PACKAGE_CDROM=  Yes
 WANTLIB=   c m pcre
 
 CONFIGURE_STYLE=   gnu
-MODGNU_CONFIG_GUESS_DIRS=  ${WRKSRC} ${WRKSRC}/src/pcre
-CONFIGURE_ARGS=--with-htmldir=${PREFIX}/share/doc/hypermail
+CONFIGURE_ARGS=--with-htmldir=${PREFIX}/share/doc/hypermail\
+   --disable-i18n
 CONFIGURE_ENV= CFLAGS="${CFLAGS} -DHAVE_VFSCANF" \
INCLUDES="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/hypermail/distinfo b/mail/hypermail/distinfo
index fd3b511d028..dec0fca4631 100644
--- a/mail/hypermail/distinfo
+++ b/mail/hypermail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hypermail-2.1.8.tar.gz) = Y5TFrfVltYSSr7SiZ90sNfKeV18IAhzQs7s8epgAu4c=
-SIZE (hypermail-2.1.8.tar.gz) = 1238173
+SHA256 (hypermail-2.3.0.tar.gz) = YZk4sM9U6ueG827yN/EG73v/elxpkEyjKv2NR78WBdE=
+SIZE (hypermail-2.3.0.tar.gz) = 1280010
diff --git a/mail/hypermail/patches/patch-Makefile_in 
b/mail/hypermail/patches/patch-Makefile_in
index ecb3587bcb7..32dbc5681a4 100644
--- a/mail/hypermail/patches/patch-Makefile_in
+++ b/mail/hypermail/patches/patch-Makefile_in
@@ -1,12 +1,9 @@
-$OpenBSD: patch-Makefile_in,v 1.6 2003/03/06 20:51:39 brad Exp $
 Makefile.in.orig   Wed Mar  5 23:31:52 2003
-+++ Makefile.inWed Mar  5 23:32:23 2003
-@@ -28,9 +28,9 @@ INSTALL_PROG=@INSTALL@
-  
- # Compiler to use
+Index: Makefile.in
+--- Makefile.in.orig
 Makefile.in
+@@ -30,7 +30,7 @@ INSTALL_PROG=@INSTALL@
  CC=@CC@ 
--CFLAGS=@CFLAGS@ @INCLUDES@ -Ipcre -DTRIO_MINIMAL $(WARNINGS)
-+CFLAGS=@CFLAGS@ @INCLUDES@ -DTRIO_MINIMAL $(WARNINGS)
+ CFLAGS=@CFLAGS@ @INCLUDES@ -Ipcre -DTRIO_MINIMAL $(WARNINGS)
  LIBS=@LIBS@
 -LDFLAGS=@LDFLAGS@ -Lpcre
 +LDFLAGS=@LDFLAGS@
diff --git a/mail/hypermail/patches/patch-configure 
b/mail/hypermail/patches/patch-configure
index 7be42e70b24..97ceadfd2f7 100644
--- a/mail/hypermail/patches/patch-configure
+++ b/mail/hypermail/patches/patch-configure
@@ -1,7 +1,8 @@
 $OpenBSD: patch-configure,v 1.5 2013/04/19 20:20:36 sthen Exp $
 configure.orig Fri Feb 14 00:42:38 2003
-+++ configure  Fri Apr 19 21:11:22 2013
-@@ -544,14 +544,11 @@ fi
+Index: configure
+--- configure.orig
 configure
+@@ -546,14 +546,11 @@ fi
  
  
  
@@ -16,7 +17,7 @@ $OpenBSD: patch-configure,v 1.5 2013/04/19 20:20:36 sthen Exp 
$
  
  
  ac_aux_dir=
-@@ -2014,11 +2011,9 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = ye
+@@ -2016,11 +2013,9 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = ye
GDBM_LIB="-lgdbm"
  else
echo "$ac_t""no" 1>&6
diff --git a/mail/hypermail/patches/patch-docs_hmrc_4 
b/mail/hypermail/patches/patch-docs_hmrc_4
index dcf31ee1ea9..7291efee71a 100644
--- a/mail/hypermail/patches/patch-docs_hmrc_4
+++ b/mail/hypermail/patches/patch-docs_hmrc_4
@@ -2,13 +2,8 @@ $OpenBSD: patch-docs_hmrc_4,v 1.7 2013/04/19 20:20:36 sthen 
Exp $
 --- docs/hmrc.4.orig   Thu Apr 24 18:29:11 2003
 +++ docs/hmrc.4Fri Apr 19 21:11:22 2013
 @@ -1,4 +1,4 @@
--.TH hmrc 4 "February 01, 2002"
-+.TH hmrc 5 "February 01, 2002"
+-.TH hmrc 4 "February 04, 2004"
++.TH hmrc 5 "February 04, 2004"
  .SH NAME
  hmrc \- Hypermail configuration file 
  .SH DESCRIPTION
-@@ -617,4 +617,3 @@ files so appropriate information can be filled in at r
-  %D - Date META TAG - Not valid on index pages
-  %S - Subject META TAG 
- .nr
--.TP
diff --git a/mail/hypermail/patches/patch-docs_hmrc_html 
b/mail/hypermail/patches/patch-docs_hmrc_html
index 551243e6d8b..18410437b3d 100644
--- 

Re: update mail/hypermail from 2.1.8 to 2.3.0

2018-06-08 Thread Solene Rapenne


Solene Rapenne writes:

> Hiltjo Posthuma writes:
>
>> Hi,
>>
>> This is a stab at updating hypermail to 2.3.0.
>>
>> A few patches are not needed anymore.
>>
>> I'm sure I made some stupid mistakes.
>>
>> Briefly tested on amd64.
>>
>
> There is no MASTER_SITES defined so we can't download the distfiles.
>
> Also, I found an extra patch which add patches/patch-configure.orig
> which should be removed.
>
> Does using the new version requires changes for 2.1.8 users?

Forget about the patch-configure.orig :)



Re: update mail/hypermail from 2.1.8 to 2.3.0

2018-06-08 Thread Solene Rapenne


Hiltjo Posthuma writes:

> Hi,
>
> This is a stab at updating hypermail to 2.3.0.
>
> A few patches are not needed anymore.
>
> I'm sure I made some stupid mistakes.
>
> Briefly tested on amd64.
>

There is no MASTER_SITES defined so we can't download the distfiles.

Also, I found an extra patch which add patches/patch-configure.orig
which should be removed.

Does using the new version requires changes for 2.1.8 users?



CVS: cvs.openbsd.org: ports

2018-06-08 Thread Stuart Cassoff
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2018/06/08 06:41:29

Modified files:
databases/iodbc: Makefile 
databases/iodbc/patches: patch-etc_odbc_ini_sample 
 patch-etc_odbcinst_ini_sample 

Log message:
Add SQLite3 ODBC driver to .ini files.
Refresh WANTLIB, bump REVISION.

ok sthen@



CVS: cvs.openbsd.org: ports

2018-06-08 Thread Stuart Cassoff
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2018/06/08 06:38:28

Modified files:
databases  : Makefile 

Log message:
+sqlite3-odbc



CVS: cvs.openbsd.org: ports

2018-06-08 Thread Stuart Cassoff
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2018/06/08 06:37:23

Log message:
Import sqlite3-odbc-0.9996.

ODBC driver for SQLite3.

ok sthen@

Status:

Vendor Tag: stu
Release Tags:   stu_20180608

N ports/databases/sqlite3-odbc/Makefile
N ports/databases/sqlite3-odbc/distinfo
N ports/databases/sqlite3-odbc/pkg/DESCR
N ports/databases/sqlite3-odbc/pkg/PLIST
N ports/databases/sqlite3-odbc/patches/patch-configure

No conflicts created by this import



Re: NEW: net/bitcoin

2018-06-08 Thread tfrohw...@fastmail.com
I think the blockchain size is a deterrent. I can test it when I'm back from 
traveling in ~ 10 days and have access to additional GB on my external drive, 
in case that helps.

On June 8, 2018 6:53:55 AM UTC, Rafael Sadowski  wrote:
>3rd ping, or 4rd? Could anyone sacrifice themselves, please.
>
>It's not evil! It's NOT mining. ;)
>
>On Wed Apr 25, 2018 at 09:31:02PM +0200, Rafael Sadowski wrote:
>> Hi ports@
>> 
>> Attached is a new port for bitcoin. Long time ago pascal@ started
>> working on bitcoin in openbsd-wip. I've finished this work and run a
>full
>> bitcoin node over weeks without problems so far:
>> 
>> https://twitter.com/sizeofvoid/status/976586173538885632
>> 
>> $ cat net/bitcoin/pkg/DESCR
>> 
>> Bitcoin is an experimental new digital currency that enables instant
>> payments to anyone, anywhere in the world. Bitcoin uses peer-to-peer
>> technology to operate with no central authority: managing
>transactions
>> and issuing money are carried out collectively by the network.
>> Bitcoin is also the name of the open source software which enables
>> the use of this currency.
>> 
>> Ok? Comments?
>> 
>> Greetings to the hackerroom.
>> 
>> Rafael Sadowski



Re: new: www/hugo

2018-06-08 Thread fredl

Hey,

attached is the new version with golang/dep.

Do you have any more feedback? :) And thank you for
your help so far!

fredl


On 06/07/18 18:14, fredl wrote:

This sounds great! Thank you for this hint!

I will keep you updated!


On 07.06.2018, at 18:10, Solene Rapenne  wrote:


fredl writes:


I just took a look. These are a LOT of extra libraries.

Is the first version really not ok? The version with the binaries?
I can try to get this ~20 extra libraries working, but alone the extra effort 
for the version control seems odd in the long run.

fredl


On 07.06.2018, at 17:25, fredl  wrote:

Ok thanks!


On 07.06.2018, at 17:23, Solene Rapenne  wrote:


fredl writes:


On 06/07/18 14:20, Solene Rapenne wrote:
fredl writes:


Hey,

thanks for this quick review!

I will look at this and answer with a new .tgz once I have it done.

thanks again!
fredl


On 07.06.2018, at 13:18, Solene Rapenne  wrote:


fredl writes:


Hey,

attached is a new port, www/hugo. hugo is a static website generator.

---
pkg/DESCR:

Hugo is a static HTML and CSS website generator written in Go.
It is optimized for speed, ease of use, and configurability.
Hugo takes a directory with content and templates and renders
them into a full HTML website.

Hugo relies on Markdown files with front matter for metadata.

---

It should working on am64 and i386.
I've only been able to test on amd64, if someone could test it on
i386, it would be
great!

Ok?

fredl

Hello

Your port use a binary downloaded from github, it's not the way to
go. It shoud be built from sources.

You should also change the order of variables in your makefile, you can
check the file infrastructure/templates/Makefile.template from the ports
tree as an example for reordering correctly.

for restricting to supported archs you can use this line.

ONLY_FOR_ARCHS =${GO_ARCHS}

Hey,

thanks again!

This version builts from sources + I added man-pages.
Is this a better version?

fredl

portcheck is happy and the makefile looks better but your port is using
"go get" to download files, it's not allowed and doesn't even work
because the user building port is by default prohibited to get network
access (when you use the dedicated ports building user).

If your port need extra libraries, then you should make ports for those
libraries and add them as LIB_DEPENDS to www/hugo. If the extra files
are assets or static files, it can be downloaded within the port by
adding them to DISTFILES (you can find an example in x11/stumpwm).

I've been speaking about this with abieber@ and sthen@, one way to go is
to fetch the sources on your computer, use the software dep
(https://github.com/golang/dep) with "dep ensure" to fetch all the
libraries needed and store it in some directory named "vendor". Then you
can create a tarball of the whole sources needed (exclude the .git files
because it's not useful) and host it somewhere, and use this tarball for
your port.




hugo.tgz
Description: Binary data


Re: [update] mpd/mpc/ncmpc/ncmpcpp

2018-06-08 Thread Edd Barrett
On Fri, Jun 08, 2018 at 07:17:55AM +0200, Landry Breuil wrote:
> On Fri, Jun 08, 2018 at 07:11:53AM +0200, Rafael Sadowski wrote:
> > General issue: MPD+sndio don't nix sound. Can't start song with MPD when
> > mpv is running. I've always had that issue.
> 
> I've fixed that annoying issue by starting mpd at boot as user _mpd
> after sndiod, and then copying /var/spool/mpd/.aucat_cookie to my own
> ~/.aucat_cookie.

I've run into that issue in the past too. Is it worth adding this trick
to a README?

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



CVS: cvs.openbsd.org: ports

2018-06-08 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/06/08 01:36:58

Modified files:
meta/kde4  : Makefile 

Log message:
unbreak, x11/yakuake-kde4 is no more



Re: NEW: net/bitcoin

2018-06-08 Thread Rafael Sadowski
3rd ping, or 4rd? Could anyone sacrifice themselves, please.

It's not evil! It's NOT mining. ;)

On Wed Apr 25, 2018 at 09:31:02PM +0200, Rafael Sadowski wrote:
> Hi ports@
> 
> Attached is a new port for bitcoin. Long time ago pascal@ started
> working on bitcoin in openbsd-wip. I've finished this work and run a full
> bitcoin node over weeks without problems so far:
> 
> https://twitter.com/sizeofvoid/status/976586173538885632
> 
> $ cat net/bitcoin/pkg/DESCR
> 
> Bitcoin is an experimental new digital currency that enables instant
> payments to anyone, anywhere in the world. Bitcoin uses peer-to-peer
> technology to operate with no central authority: managing transactions
> and issuing money are carried out collectively by the network.
> Bitcoin is also the name of the open source software which enables
> the use of this currency.
> 
> Ok? Comments?
> 
> Greetings to the hackerroom.
> 
> Rafael Sadowski




UPDATE: Nextcloud-13.0.3

2018-06-08 Thread Gonzalo L. Rodriguez

Hello,

Update for Nextcloud to 13.0.3:

https://nextcloud.com/changelog/

While here, I moved the httpd(8) to the README as we did on owncloud.

OK? Comments?

Cheers.-

--
Sending from my toaster.
Index: Makefile
===
RCS file: /cvs/ports/www/nextcloud/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile2 Jun 2018 20:58:30 -   1.16
+++ Makefile8 Jun 2018 06:29:00 -
@@ -2,8 +2,7 @@
 
 COMMENT=   easy and universal access to shared and/or personal 
files
 
-V= 13.0.2
-REVISION=  2
+V= 13.0.3
 DISTNAME=  nextcloud-${V}
 EXTRACT_SUFX=  .tar.bz2
 
@@ -72,7 +71,5 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/conf/modules.sample
${SUBST_CMD} -m 0644 -c ${FILESDIR}/apache-nextcloud.conf.dist.in \
${PREFIX}/conf/modules.sample/apache-nextcloud.conf.dist
-   ${SUBST_CMD} -m 0644 -c ${FILESDIR}/httpd-nextcloud.conf.dist.in \
-   ${PREFIX}/conf/modules.sample/httpd-nextcloud.conf.dist
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/www/nextcloud/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo27 Apr 2018 06:24:02 -  1.10
+++ distinfo8 Jun 2018 06:29:00 -
@@ -1,2 +1,2 @@
-SHA256 (nextcloud-13.0.2.tar.bz2) = 
c5b5ihpTqfSxRPVTYNh8ictu6Jn+7xz78ppzYhn5xH0=
-SIZE (nextcloud-13.0.2.tar.bz2) = 44842305
+SHA256 (nextcloud-13.0.3.tar.bz2) = 
GDZnVAgA3QRepXgB/t+MooDegrkVgkEqrQfULtcek+Q=
+SIZE (nextcloud-13.0.3.tar.bz2) = 45128672
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/nextcloud/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST   17 May 2018 08:57:47 -  1.12
+++ pkg/PLIST   8 Jun 2018 06:29:03 -
@@ -1,10 +1,9 @@
 @comment $OpenBSD: PLIST,v 1.12 2018/05/17 08:57:47 gonzalo Exp $
 @unexec-delete rm -f ${PREFIX}/conf/modules/httpd-nextcloud.conf
 @unexec-delete rm -f ${PREFIX}/conf/modules/apache-nextcloud.conf
+conf/modules.sample/
 conf/modules.sample/apache-nextcloud.conf.dist
-@sample ${PREFIX}/conf/modules.sample/apache-nextcloud.conf
-conf/modules.sample/httpd-nextcloud.conf.dist
-@sample ${PREFIX}/conf/modules.sample/httpd-nextcloud.conf
+@sample conf/modules.sample/apache-nextcloud.conf
 nextcloud/
 nextcloud/.htaccess.dist
 @sample nextcloud/.htaccess
@@ -5929,6 +5928,7 @@ nextcloud/apps/dav/lib/CardDAV/Xml/Group
 nextcloud/apps/dav/lib/Command/
 nextcloud/apps/dav/lib/Command/CreateAddressBook.php
 nextcloud/apps/dav/lib/Command/CreateCalendar.php
+nextcloud/apps/dav/lib/Command/RemoveInvalidShares.php
 nextcloud/apps/dav/lib/Command/SyncBirthdayCalendar.php
 nextcloud/apps/dav/lib/Command/SyncSystemAddressBook.php
 nextcloud/apps/dav/lib/Comments/
@@ -9357,14 +9357,8 @@ nextcloud/apps/firstrunwizard/l10n/
 nextcloud/apps/firstrunwizard/l10n/.gitignore
 nextcloud/apps/firstrunwizard/l10n/.tx/
 nextcloud/apps/firstrunwizard/l10n/.tx/config
-nextcloud/apps/firstrunwizard/l10n/ar.js
-nextcloud/apps/firstrunwizard/l10n/ar.json
 nextcloud/apps/firstrunwizard/l10n/ast.js
 nextcloud/apps/firstrunwizard/l10n/ast.json
-nextcloud/apps/firstrunwizard/l10n/az.js
-nextcloud/apps/firstrunwizard/l10n/az.json
-nextcloud/apps/firstrunwizard/l10n/bg.js
-nextcloud/apps/firstrunwizard/l10n/bg.json
 nextcloud/apps/firstrunwizard/l10n/bn_IN.php
 nextcloud/apps/firstrunwizard/l10n/ca.js
 nextcloud/apps/firstrunwizard/l10n/ca.json
@@ -9382,8 +9376,6 @@ nextcloud/apps/firstrunwizard/l10n/el.js
 nextcloud/apps/firstrunwizard/l10n/el.json
 nextcloud/apps/firstrunwizard/l10n/en_GB.js
 nextcloud/apps/firstrunwizard/l10n/en_GB.json
-nextcloud/apps/firstrunwizard/l10n/eo.js
-nextcloud/apps/firstrunwizard/l10n/eo.json
 nextcloud/apps/firstrunwizard/l10n/es.js
 nextcloud/apps/firstrunwizard/l10n/es.json
 nextcloud/apps/firstrunwizard/l10n/es_419.js
@@ -9424,8 +9416,6 @@ nextcloud/apps/firstrunwizard/l10n/et_EE
 nextcloud/apps/firstrunwizard/l10n/et_EE.json
 nextcloud/apps/firstrunwizard/l10n/eu.js
 nextcloud/apps/firstrunwizard/l10n/eu.json
-nextcloud/apps/firstrunwizard/l10n/fa.js
-nextcloud/apps/firstrunwizard/l10n/fa.json
 nextcloud/apps/firstrunwizard/l10n/fi.js
 nextcloud/apps/firstrunwizard/l10n/fi.json
 nextcloud/apps/firstrunwizard/l10n/fr.js
@@ -9436,8 +9426,6 @@ nextcloud/apps/firstrunwizard/l10n/hu.js
 nextcloud/apps/firstrunwizard/l10n/hu.json
 nextcloud/apps/firstrunwizard/l10n/ia.js
 nextcloud/apps/firstrunwizard/l10n/ia.json
-nextcloud/apps/firstrunwizard/l10n/id.js
-nextcloud/apps/firstrunwizard/l10n/id.json
 nextcloud/apps/firstrunwizard/l10n/is.js
 nextcloud/apps/firstrunwizard/l10n/is.json
 nextcloud/apps/firstrunwizard/l10n/it.js
@@ -9452,30 +9440,22 @@ nextcloud/apps/firstrunwizard/l10n/ko.js
 nextcloud/apps/firstrunwizard/l10n/ku_IQ.php
 

Re: NEW: sqlite3-odbc

2018-06-08 Thread Stuart Henderson
On 2018/06/07 19:30, Stuart Cassoff wrote:
> ODBC driver for SQLite3.
> 
> Also a patch to iodbc to add the sqlite odbc driver to the .ini files, and a 
> wantlib tweak.
> 
> Tested on amd64 and i386.
> 
> $ echo "select fullpkgpath from ports where maintainer like '%Stu%'" | 
> iodbctest Driver=SQLite3\;Database=/usr/local/share/sqlports

iodbc -admin changes too, please bump REVISION instead of DEVISION-main.
Otherwise ok