Re: grip 3.5.2

2017-08-28 Thread Antoine Jacoutot 
On Mon, Aug 28, 2017 at 08:46:11PM +0200, Landry Breuil wrote:
> On Wed, Aug 16, 2017 at 05:47:42PM +0200, Antoine Jacoutot wrote:
> > On Mon, Aug 07, 2017 at 11:36:18AM +0200, Landry Breuil wrote:
> > > Hi,
> > > 
> > > so audio/grip got a new upstream maintainer after 12 years of abandon
> > > (http://www.solbu.net/english/tag/grip.html) - lots of patches merged
> > > from various linux distros. I removed the patches disabling the help
> > > menu as it seems to work just fine with yelp, im just not sure which
> > > RUN_DEPENDS should be set now .. antoine ?
> > 
> > You'd better of using the x11/gnome MODULE for that port (along with
> > MODGNOME_TOOLS), that would simplify things I think.
> 
> so, something like this ?

Yup, looks good.

> 

> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/grip/Makefile,v
> retrieving revision 1.58
> diff -u -r1.58 Makefile
> --- Makefile  26 Jul 2017 22:45:15 -  1.58
> +++ Makefile  28 Aug 2017 18:45:19 -
> @@ -2,14 +2,11 @@
>  
>  COMMENT= front-end to external cd audio rippers and mp3 encoders
>  
> -DISTNAME=grip-3.3.1
> +DISTNAME=grip-3.5.2
>  CATEGORIES=  audio
> -REVISION=6
>  
>  HOMEPAGE=http://sourceforge.net/projects/grip/
>  
> -MAINTAINER=  Steve Shockley 
> -
>  # GPLv2
>  PERMIT_PACKAGE_CDROM=Yes
>  
> @@ -21,8 +18,15 @@
>  WANTLIB += gnome-2 gnomecanvas-2 gnomeui-2 gnomevfs-2 gobject-2.0
>  WANTLIB += gthread-2.0 gtk-x11-2.0 id3 intl m nghttp2 pango-1.0
>  WANTLIB += pangocairo-1.0 pangoft2-1.0 popt pthread ssl ${COMPILER_LIBCXX} 
> vte z
> +WANTLIB += ORBitCosNaming-2 canberra dbus-1 dbus-glib-1 expat
> +WANTLIB += ffi gailutil gcrypt gnome-keyring gpg-error graphite2
> +WANTLIB += harfbuzz iconv ltdl lzma ncurses ogg pcre pixman-1
> +WANTLIB += png pthread-stubs util vorbis vorbisfile xcb xcb-render
> +WANTLIB += xcb-shm xml2
>  
>  MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=grip/}
> +MODULES =x11/gnome
> +MODGNOME_TOOLS = yelp desktop-file-utils
>  
>  LIB_DEPENDS= audio/cdparanoia \
>   audio/id3lib \
> @@ -32,14 +36,8 @@
>   x11/gnome/libgnomeui
>  
>  RUN_DEPENDS= audio/vorbis-tools \
> - devel/desktop-file-utils
>  
> +BUILD_DEPENDS =  devel/gettext-tools
>  CONFIGURE_STYLE= gnu
> -CONFIGURE_ENV=   CPPFLAGS="-I${LOCALBASE}/include" \
> - LDFLAGS="-L${LOCALBASE}/lib"
> -
> -# see patch-src_grip_c
> -post-install:
> - rm -rf ${PREFIX}/share/gnome
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/audio/grip/distinfo,v
> retrieving revision 1.7
> diff -u -r1.7 distinfo
> --- distinfo  17 Jan 2013 13:30:32 -  1.7
> +++ distinfo  28 Aug 2017 18:45:19 -
> @@ -1,2 +1,2 @@
> -SHA256 (grip-3.3.1.tar.gz) = 1GOUoQYu0Gb5xjOwEP0QWeY9nteRu7eoW8ZWfPD9Zv0=
> -SIZE (grip-3.3.1.tar.gz) = 812562
> +SHA256 (grip-3.5.2.tar.gz) = qmeTHvOoDvVzUdSHviIQsvcDCha0H/LzjSLMx21/ibc=
> +SIZE (grip-3.5.2.tar.gz) = 952153
> Index: patches/patch-configure
> ===
> RCS file: /cvs/ports/audio/grip/patches/patch-configure,v
> retrieving revision 1.6
> diff -u -r1.6 patch-configure
> --- patches/patch-configure   17 Jan 2013 13:30:32 -  1.6
> +++ patches/patch-configure   28 Aug 2017 18:45:19 -
> @@ -1,39 +1,13 @@
>  $OpenBSD: patch-configure,v 1.6 2013/01/17 13:30:32 ajacoutot Exp $
>  configure.orig   Sat Jun 25 20:40:07 2005
> -+++ configureThu Jan 17 13:44:53 2013
> -@@ -4313,7 +4313,7 @@ done
> - 
> +Index: configure
> +--- configure.orig
>  configure
> +@@ -4968,7 +4968,7 @@ fi
>   
> + done
>   
>  -for ac_header in linux/soundcard.h machine/soundcard.h sys/soundcard.h 
> sys/audioio.h sys/audio.io.h sun/audioio.h
>  +for ac_header in soundcard.h linux/soundcard.h machine/soundcard.h 
> sys/soundcard.h sys/audioio.h sys/audio.io.h sun/audioio.h
> - do
> - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
> - if eval "test \"\${$as_ac_Header+set}\" = set"; then
> -@@ -9454,7 +9454,7 @@ echo "$as_me: error: curl libs are missing" >&2;}
> - fi
> - 
> - 
> --GETTEXT_PACKAGE=grip-2.2
> -+GETTEXT_PACKAGE=grip
> - 
> - 
> - cat >>confdefs.h <<_ACEOF
> -@@ -11149,7 +11149,7 @@ fi
> - rm -f conftest.err conftest.$ac_objext \
> -   conftest$ac_exeext conftest.$ac_ext
> - if test "$ac_cv_search_ID3Tag_Link" = no; then
> --  for ac_lib in "id3 -lz -lstdc++"; do
> -+  for ac_lib in "id3 -lm -lz -lstdc++"; do
> - LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
> - cat >conftest.$ac_ext <<_ACEOF
> - /* confdefs.h.  */
> -@@ -11275,7 +11275,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
> -   ac_status=$?
> -   echo "$as_me:$LINENO: \$? = $ac_status" >&5
> -   (exit $ac_status); }; }; then
> --  . conftest.id3
> -+  . $srcdir/conftest.id3
> -echo

Re: [update] py-click-log 0.2.0

2017-08-28 Thread Remi Locherer 
On Mon, Aug 28, 2017 at 06:35:19PM -0400, Daniel Jakots wrote:
> On Mon, 28 Aug 2017 22:38:36 +0200, Remi Locherer
>  wrote:
> 
> > Hi,
> > 
> > this updates py-click-log to version 0.2.0. vidirsyncer 0.16.2 is
> > going to need it (diff in the next mail).
> 
> We can easily add tests it seems. Are you ok with this patch?
> 

Yes, makes sense. I'm getting an error when I run make test without
having py-click installed. But with the below patch it works fine.

Remi


Index: Makefile
===
RCS file: /cvs/ports/devel/py-click-log/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile8 Mar 2017 02:40:41 -   1.1.1.1
+++ Makefile29 Aug 2017 04:54:01 -
@@ -2,7 +2,7 @@
 
 COMMENT =  logging integration for Python click
 
-MODPY_EGG_VERSION =0.1.8
+MODPY_EGG_VERSION =0.2.0
 DISTNAME = click-log-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 
@@ -14,6 +14,8 @@ HOMEPAGE =https://github.com/click-con
 PERMIT_PACKAGE_CDROM = Yes
 
 RUN_DEPENDS =  devel/py-click${MODPY_FLAVOR}
+TEST_DEPENDS = devel/py-test${MODPY_FLAVOR} \
+   ${RUN_DEPENDS}
 
 MODULES =  lang/python
 
@@ -22,5 +24,8 @@ MODPY_SETUPTOOLS =Yes
 
 FLAVORS =  python3
 FLAVOR ?=
+
+do-test:
+   cd ${WRKSRC} && ${MODPY_BIN} -m pytest
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/devel/py-click-log/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo8 Mar 2017 02:40:41 -   1.1.1.1
+++ distinfo29 Aug 2017 04:54:01 -
@@ -1,2 +1,2 @@
-SHA256 (click-log-0.1.8.tar.gz) = VycQCMEuLcFtQTNzvt1/0/8XxXQ04WhlDcJ9+5x0M5I=
-SIZE (click-log-0.1.8.tar.gz) = 9277
+SHA256 (click-log-0.2.0.tar.gz) = F2oIX6y3726j6y6Zh+yOiwv7nBcxo/OAdGT7EGV3Wa4=
+SIZE (click-log-0.2.0.tar.gz) = 9665

Re: [update] vdirsyncer 0.16.2

2017-08-28 Thread Daniel Jakots 
On Mon, 28 Aug 2017 22:19:24 -0400, Daniel Jakots 
wrote:

> On Mon, 28 Aug 2017 22:43:10 +0200, Remi Locherer
>  wrote:
> 
> > Hi,
> > 
> > This updates vdirsyncer to version 0.16.2 released few days ago.
> > 
> > From the change log:
> > --
> > Version 0.16.2
> > 
> > released on 24 August 2017
> > 
> > Fix crash when using daterange or item_type filters
> > in :storage:`google_calendar`, see :gh:`657`. Packagers: Fixes for
> > new version 0.2.0 of click-log. The version requirements for the
> > dependency click-log changed.
> > 
> > Version 0.16.1
> > 
> > released on 8 August 2017
> > 
> > Removed remoteStorage support, see :gh:`647`.
> > Fixed test failures caused by latest requests version,
> > see :gh:`660`. --
> > 
> > I tested it with my collection of contacts against Baikal.  
> 
> When I ran make fake I've got some errors

Meh. I didn't have latest py-click-log installed, works fine with but

> and make test also fails

Still:
/usr/ports/productivity/vdirsyncer$ make test  
===>  Regression tests for vdirsyncer-0.16.2
running test
running egg_info
writing vdirsyncer.egg-info/PKG-INFO
writing dependency_links to vdirsyncer.egg-info/dependency_links.txt
writing entry points to vdirsyncer.egg-info/entry_points.txt
writing requirements to vdirsyncer.egg-info/requires.txt
writing top-level names to vdirsyncer.egg-info/top_level.txt
reading manifest file 'vdirsyncer.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
no previously-included directories found matching 'contrib'
no previously-included directories found matching 'scripts'
no previously-included directories found matching 'tests/storage/etesync'
no previously-included directories found matching 'docs/_build'
warning: no previously-included files matching '*.py[cdo]' found anywhere in 
distribution
warning: no previously-included files matching '__pycache__' found anywhere in 
distribution
warning: no previously-included files matching '*.so' found anywhere in 
distribution
warning: no previously-included files matching '*.pyd' found anywhere in 
distribution
writing manifest file 'vdirsyncer.egg-info/SOURCES.txt'
running build_ext
Traceback (most recent call last):
  File "./setup.py", line 103, in 
'Topic :: Utilities',
  File "/usr/local/lib/python3.6/distutils/core.py", line 148, in setup
dist.run_commands()
  File "/usr/local/lib/python3.6/distutils/dist.py", line 955, in run_commands
self.run_command(cmd)
  File "/usr/local/lib/python3.6/distutils/dist.py", line 974, in run_command
cmd_obj.run()
  File "/usr/local/lib/python3.6/site-packages/setuptools/command/test.py", 
line 210, in run
self.run_tests()
  File "/usr/local/lib/python3.6/site-packages/setuptools/command/test.py", 
line 231, in run_tests
testRunner=self._resolve_as_ep(self.test_runner),
  File "/usr/local/lib/python3.6/unittest/main.py", line 94, in __init__
self.parseArgs(argv)
  File "/usr/local/lib/python3.6/unittest/main.py", line 124, in parseArgs
self._do_discovery([])
  File "/usr/local/lib/python3.6/unittest/main.py", line 229, in _do_discovery
self.test = loader.discover(self.start, self.pattern, self.top)
  File "/usr/local/lib/python3.6/unittest/loader.py", line 341, in discover
tests = list(self._find_tests(start_dir, pattern))
  File "/usr/local/lib/python3.6/unittest/loader.py", line 398, in _find_tests
full_path, pattern, namespace)
  File "/usr/local/lib/python3.6/unittest/loader.py", line 475, in 
_find_test_path
tests = self.loadTestsFromModule(package, pattern=pattern)
  File "/usr/local/lib/python3.6/site-packages/setuptools/command/test.py", 
line 42, in loadTestsFromModule
tests.append(self.loadTestsFromName(submodule))
  File "/usr/local/lib/python3.6/unittest/loader.py", line 190, in 
loadTestsFromName
return self.loadTestsFromModule(obj)
  File "/usr/local/lib/python3.6/site-packages/setuptools/command/test.py", 
line 42, in loadTestsFromModule
tests.append(self.loadTestsFromName(submodule))
  File "/usr/local/lib/python3.6/unittest/loader.py", line 153, in 
loadTestsFromName
module = __import__(module_name)
  File 
"/usr/ports/pobj/vdirsyncer-0.16.2/vdirsyncer-0.16.2/tests/storage/dav/__init__.py",
 line 20, in 
dav_server = os.environ['DAV_SERVER']
  File "/usr/local/lib/python3.6/os.py", line 669, in __getitem__
raise KeyError(key) from None
KeyError: 'DAV_SERVER'
*** Error 1 in . (/usr/ports/lang/python/python.port.mk:197 'do-test': @cd 
/usr/ports/pobj/vdirsyncer-0.16.2/vdirsyncer-0.16.2 && /usr/bin/e...)
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2745 
'/usr/ports/pobj/vdirsyncer-0.16.2/.test_done')
*** Error 1 in /usr/ports/productivity/vdirsyncer 
(/usr/ports/infrastructure/mk/bsd.port.mk:2420 'test')

Does it work for you if you put a DAV_SERVER in your env?

Re: [update] vdirsyncer 0.16.2

2017-08-28 Thread Daniel Jakots 
On Mon, 28 Aug 2017 22:43:10 +0200, Remi Locherer
 wrote:

> Hi,
> 
> This updates vdirsyncer to version 0.16.2 released few days ago.
> 
> From the change log:
> --
> Version 0.16.2
> 
> released on 24 August 2017
> 
> Fix crash when using daterange or item_type filters
> in :storage:`google_calendar`, see :gh:`657`. Packagers: Fixes for
> new version 0.2.0 of click-log. The version requirements for the
> dependency click-log changed.
> 
> Version 0.16.1
> 
> released on 8 August 2017
> 
> Removed remoteStorage support, see :gh:`647`.
> Fixed test failures caused by latest requests version,
> see :gh:`660`. --
> 
> I tested it with my collection of contacts against Baikal.

When I ran make fake I've got some errors and make test also fails
here.
Log:

/usr/ports/productivity/vdirsyncer$ make fake  
===>  Checking files for vdirsyncer-0.16.2
`/usr/ports/distfiles/vdirsyncer-0.16.2.tar.gz' is up to date.
>> (SHA256) vdirsyncer-0.16.2.tar.gz: OK
===> vdirsyncer-0.16.2 depends on: py3-sphinx-* -> py3-sphinx-1.4.8p0
===> vdirsyncer-0.16.2 depends on: py3-setuptools_scm-* -> 
py3-setuptools_scm-1.15.6
===> vdirsyncer-0.16.2 depends on: py3-atomicwrites-* -> py3-atomicwrites-1.1.5
===> vdirsyncer-0.16.2 depends on: py3-click-log-* -> py3-click-log-0.1.8
===> vdirsyncer-0.16.2 depends on: py3-click-threading-* -> 
py3-click-threading-0.4.3
===> vdirsyncer-0.16.2 depends on: py3-requests-toolbelt-* -> 
py3-requests-toolbelt-0.7.1
===> vdirsyncer-0.16.2 depends on: python->=3.6,<3.7 -> python-3.6.2
===> vdirsyncer-0.16.2 depends on: py3-setuptools->=28.6.1v0 -> 
py3-setuptools-28.6.1p0v0
===>  Extracting for vdirsyncer-0.16.2
===>  Patching for vdirsyncer-0.16.2
===>  Compiler link: clang -> /usr/bin/clang
===>  Compiler link: clang++ -> /usr/bin/clang++
===>  Compiler link: cc -> /usr/bin/cc
===>  Compiler link: c++ -> /usr/bin/c++
===>  Configuring for vdirsyncer-0.16.2
===>  Building for vdirsyncer-0.16.2
running egg_info
writing vdirsyncer.egg-info/PKG-INFO
writing dependency_links to vdirsyncer.egg-info/dependency_links.txt
writing entry points to vdirsyncer.egg-info/entry_points.txt
writing requirements to vdirsyncer.egg-info/requires.txt
writing top-level names to vdirsyncer.egg-info/top_level.txt
reading manifest file 'vdirsyncer.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
no previously-included directories found matching 'contrib'
no previously-included directories found matching 'scripts'
no previously-included directories found matching 'tests/storage/etesync'
no previously-included directories found matching 'docs/_build'
warning: no previously-included files matching '*.py[cdo]' found anywhere in 
distribution
warning: no previously-included files matching '__pycache__' found anywhere in 
distribution
warning: no previously-included files matching '*.so' found anywhere in 
distribution
warning: no previously-included files matching '*.pyd' found anywhere in 
distribution
writing manifest file 'vdirsyncer.egg-info/SOURCES.txt'
running build
running build_py
creating /usr/ports/pobj/vdirsyncer-0.16.2/vdirsyncer-0.16.2/lib
creating /usr/ports/pobj/vdirsyncer-0.16.2/vdirsyncer-0.16.2/lib/vdirsyncer
copying vdirsyncer/sync.py -> 
/usr/ports/pobj/vdirsyncer-0.16.2/vdirsyncer-0.16.2/lib/vdirsyncer
copying vdirsyncer/http.py -> 
/usr/ports/pobj/vdirsyncer-0.16.2/vdirsyncer-0.16.2/lib/vdirsyncer
copying vdirsyncer/__main__.py -> 
/usr/ports/pobj/vdirsyncer-0.16.2/vdirsyncer-0.16.2/lib/vdirsyncer
copying vdirsyncer/metasync.py -> 
/usr/ports/pobj/vdirsyncer-0.16.2/vdirsyncer-0.16.2/lib/vdirsyncer
copying vdirsyncer/exceptions.py -> 
/usr/ports/pobj/vdirsyncer-0.16.2/vdirsyncer-0.16.2/lib/vdirsyncer
copying vdirsyncer/version.py -> 
/usr/ports/pobj/vdirsyncer-0.16.2/vdirsyncer-0.16.2/lib/vdirsyncer
copying vdirsyncer/__init__.py -> 
/usr/ports/pobj/vdirsyncer-0.16.2/vdirsyncer-0.16.2/lib/vdirsyncer
copying vdirsyncer/repair.py -> 
/usr/ports/pobj/vdirsyncer-0.16.2/vdirsyncer-0.16.2/lib/vdirsyncer
copying vdirsyncer/vobject.py -> 
/usr/ports/pobj/vdirsyncer-0.16.2/vdirsyncer-0.16.2/lib/vdirsyncer
copying vdirsyncer/utils.py -> 
/usr/ports/pobj/vdirsyncer-0.16.2/vdirsyncer-0.16.2/lib/vdirsyncer
creating 
/usr/ports/pobj/vdirsyncer-0.16.2/vdirsyncer-0.16.2/lib/vdirsyncer/storage
copying vdirsyncer/storage/google.py -> 
/usr/ports/pobj/vdirsyncer-0.16.2/vdirsyncer-0.16.2/lib/vdirsyncer/storage
copying vdirsyncer/storage/http.py -> 
/usr/ports/pobj/vdirsyncer-0.16.2/vdirsyncer-0.16.2/lib/vdirsyncer/storage
copying vdirsyncer/storage/__init__.py -> 
/usr/ports/pobj/vdirsyncer-0.16.2/vdirsyncer-0.16.2/lib/vdirsyncer/storage
copying vdirsyncer/storage/etesync.py -> 
/usr/ports/pobj/vdirsyncer-0.16.2/vdirsyncer-0.16.2/lib/vdirsyncer/storage
copying vdirsyncer/storage/singlefile.py -> 
/usr/ports/pobj/vdirsyncer-0.16.2/vdirsyncer-0.16.2/lib/vdirsyncer/storage
copying vdirsyncer/storage/filesystem.py ->

Re: [update] py-click-log 0.2.0

2017-08-28 Thread Daniel Jakots 
On Mon, 28 Aug 2017 22:38:36 +0200, Remi Locherer
 wrote:

> Hi,
> 
> this updates py-click-log to version 0.2.0. vidirsyncer 0.16.2 is
> going to need it (diff in the next mail).

We can easily add tests it seems. Are you ok with this patch?

Cheers,
Daniel

Index: Makefile
===
RCS file: /cvs/ports/devel/py-click-log/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile8 Mar 2017 02:40:41 -   1.1.1.1
+++ Makefile28 Aug 2017 22:32:37 -
@@ -2,7 +2,7 @@
 
 COMMENT =  logging integration for Python click
 
-MODPY_EGG_VERSION =0.1.8
+MODPY_EGG_VERSION =0.2.0
 DISTNAME = click-log-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 
@@ -14,6 +14,7 @@ HOMEPAGE =https://github.com/click-con
 PERMIT_PACKAGE_CDROM = Yes
 
 RUN_DEPENDS =  devel/py-click${MODPY_FLAVOR}
+TEST_DEPENDS = devel/py-test${MODPY_FLAVOR}
 
 MODULES =  lang/python
 
@@ -22,5 +23,8 @@ MODPY_SETUPTOOLS =Yes
 
 FLAVORS =  python3
 FLAVOR ?=
+
+do-test:
+   cd ${WRKSRC} && ${MODPY_BIN} -m pytest
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/devel/py-click-log/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo8 Mar 2017 02:40:41 -   1.1.1.1
+++ distinfo28 Aug 2017 22:32:37 -
@@ -1,2 +1,2 @@
-SHA256 (click-log-0.1.8.tar.gz) = VycQCMEuLcFtQTNzvt1/0/8XxXQ04WhlDcJ9+5x0M5I=
-SIZE (click-log-0.1.8.tar.gz) = 9277
+SHA256 (click-log-0.2.0.tar.gz) = F2oIX6y3726j6y6Zh+yOiwv7nBcxo/OAdGT7EGV3Wa4=
+SIZE (click-log-0.2.0.tar.gz) = 9665

Re: CVS: cvs.openbsd.org: ports

2017-08-28 Thread Stuart Henderson 
On 2017/08/28 15:39, Stuart Henderson wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   st...@cvs.openbsd.org   2017/08/28 15:39:35
> 
> Modified files:
>   mail/dovecot-pigeonhole: Makefile distinfo 
> 
> Log message:
> update to Dovecot-Pigeonhole 0.4.20
> 

(sent too quickly; this one was also from Brad)

CVS: cvs.openbsd.org: ports

2017-08-28 Thread Stuart Henderson 
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/08/28 15:39:35

Modified files:
mail/dovecot-pigeonhole: Makefile distinfo 

Log message:
update to Dovecot-Pigeonhole 0.4.20

CVS: cvs.openbsd.org: ports

2017-08-28 Thread Stuart Henderson 
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/08/28 15:39:14

Modified files:
mail/dovecot   : Makefile distinfo 
mail/dovecot/patches: patch-doc_example-config_Makefile_in 
  patch-doc_example-config_conf_d_10-mail_conf 
  patch-doc_example-config_conf_d_Makefile_in 
mail/dovecot/pkg: PLIST-server 

Log message:
update to Dovecot 2.2.32, from Brad (and same diff here). (Amongst other
things, fixes a fairly annoying bug with replication not being able to
recover from index problems in some versions).

CVS: cvs.openbsd.org: ports

2017-08-28 Thread Ian Darwin 
CVSROOT:/cvs
Module name:ports
Changes by: i...@cvs.openbsd.org2017/08/28 14:57:06

Modified files:
devel/netbeans : Makefile 
devel/netbeans/pkg: DESCR 

Log message:
Tweak DESCR wording, bump revision.
ok giovanni@ rsadowski@ co-maintainers.

CVS: cvs.openbsd.org: ports

2017-08-28 Thread Alexander Bluhm 
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2017/08/28 14:55:01

Modified files:
security/p5-Net_SSLeay: Makefile 
Added files:
security/p5-Net_SSLeay/patches: patch-SSLeay_xs 
patch-t_local_40_npn_support_t 

Log message:
Fix the feature check for OPENSSL_NO_NEXTPROTONEG to make p5-Net-SSLeay
compile with LibreSSL after NPN has been removed.  NPN does not
work with LibreSSL anymore, do not test this feature.  Also fixes
the test of p5-IO-Socket-SSL.
discussed with beck@ doug@ jsing@

[update] vdirsyncer 0.16.2

2017-08-28 Thread Remi Locherer 
Hi,

This updates vdirsyncer to version 0.16.2 released few days ago.

>From the change log:
--
Version 0.16.2

released on 24 August 2017

Fix crash when using daterange or item_type filters in 
:storage:`google_calendar`, see :gh:`657`.
Packagers: Fixes for new version 0.2.0 of click-log. The version 
requirements for the dependency click-log changed.

Version 0.16.1

released on 8 August 2017

Removed remoteStorage support, see :gh:`647`.
Fixed test failures caused by latest requests version, see :gh:`660`.
--

I tested it with my collection of contacts against Baikal.

Remi



Index: Makefile
===
RCS file: /cvs/ports/productivity/vdirsyncer/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile17 Jul 2017 00:09:56 -  1.3
+++ Makefile28 Aug 2017 20:30:57 -
@@ -2,7 +2,7 @@
 
 COMMENT =  synchronize calendars and contacts
 
-MODPY_EGG_VERSION =0.16.0
+MODPY_EGG_VERSION =0.16.2
 DISTNAME = vdirsyncer-${MODPY_EGG_VERSION}
 CATEGORIES =   productivity
 
Index: distinfo
===
RCS file: /cvs/ports/productivity/vdirsyncer/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo17 Jul 2017 00:09:56 -  1.2
+++ distinfo28 Aug 2017 20:30:57 -
@@ -1,2 +1,2 @@
-SHA256 (vdirsyncer-0.16.0.tar.gz) = 
z9v6eZNzygj1M7/Fe9DTr+/oosX4RXgts4uImhmsqVg=
-SIZE (vdirsyncer-0.16.0.tar.gz) = 113408
+SHA256 (vdirsyncer-0.16.2.tar.gz) = 
qoGfKfS80ffdVqmNzt23GVasiQ2KNEFN+aLe+lj/uKc=
+SIZE (vdirsyncer-0.16.2.tar.gz) = 112083
Index: pkg/PLIST
===
RCS file: /cvs/ports/productivity/vdirsyncer/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   17 Jul 2017 00:09:56 -  1.2
+++ pkg/PLIST   28 Aug 2017 20:30:57 -
@@ -50,7 +50,6 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}google.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}memory.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}remotestorage.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/${MODPY_PYCACHE}singlefile.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/base.py
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/dav.py
@@ -59,7 +58,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/google.py
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/http.py
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/memory.py
-lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/remotestorage.py
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/storage/singlefile.py
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/sync.py
 lib/python${MODPY_VERSION}/site-packages/vdirsyncer/utils.py

[update] py-click-log 0.2.0

2017-08-28 Thread Remi Locherer 
Hi,

this updates py-click-log to version 0.2.0. vidirsyncer 0.16.2 is going
to need it (diff in the next mail).

Remi


Index: Makefile
===
RCS file: /cvs/ports/devel/py-click-log/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile8 Mar 2017 02:40:41 -   1.1.1.1
+++ Makefile28 Aug 2017 20:05:03 -
@@ -2,7 +2,7 @@
 
 COMMENT =  logging integration for Python click
 
-MODPY_EGG_VERSION =0.1.8
+MODPY_EGG_VERSION =0.2.0
 DISTNAME = click-log-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 
Index: distinfo
===
RCS file: /cvs/ports/devel/py-click-log/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo8 Mar 2017 02:40:41 -   1.1.1.1
+++ distinfo28 Aug 2017 20:05:03 -
@@ -1,2 +1,2 @@
-SHA256 (click-log-0.1.8.tar.gz) = VycQCMEuLcFtQTNzvt1/0/8XxXQ04WhlDcJ9+5x0M5I=
-SIZE (click-log-0.1.8.tar.gz) = 9277
+SHA256 (click-log-0.2.0.tar.gz) = F2oIX6y3726j6y6Zh+yOiwv7nBcxo/OAdGT7EGV3Wa4=
+SIZE (click-log-0.2.0.tar.gz) = 9665

CVS: cvs.openbsd.org: ports

2017-08-28 Thread Matthias Kilian 
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/08/28 13:08:30

Modified files:
print/poppler  : Makefile distinfo 

Log message:
Update to poppler-0.57.0.

CVS: cvs.openbsd.org: ports

2017-08-28 Thread Matthias Kilian 
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/08/28 13:06:35

Modified files:
print/poppler-data: Makefile distinfo 
print/poppler-data/pkg: PLIST 

Log message:
Update to poppler-data-0.4.8.

Re: grip 3.5.2

2017-08-28 Thread Landry Breuil 
On Wed, Aug 16, 2017 at 05:47:42PM +0200, Antoine Jacoutot wrote:
> On Mon, Aug 07, 2017 at 11:36:18AM +0200, Landry Breuil wrote:
> > Hi,
> > 
> > so audio/grip got a new upstream maintainer after 12 years of abandon
> > (http://www.solbu.net/english/tag/grip.html) - lots of patches merged
> > from various linux distros. I removed the patches disabling the help
> > menu as it seems to work just fine with yelp, im just not sure which
> > RUN_DEPENDS should be set now .. antoine ?
> 
> You'd better of using the x11/gnome MODULE for that port (along with
> MODGNOME_TOOLS), that would simplify things I think.

so, something like this ?

Index: Makefile
===
RCS file: /cvs/ports/audio/grip/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- Makefile26 Jul 2017 22:45:15 -  1.58
+++ Makefile28 Aug 2017 18:45:19 -
@@ -2,14 +2,11 @@
 
 COMMENT=   front-end to external cd audio rippers and mp3 encoders
 
-DISTNAME=  grip-3.3.1
+DISTNAME=  grip-3.5.2
 CATEGORIES=audio
-REVISION=  6
 
 HOMEPAGE=  http://sourceforge.net/projects/grip/
 
-MAINTAINER=Steve Shockley 
-
 # GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 
@@ -21,8 +18,15 @@
 WANTLIB += gnome-2 gnomecanvas-2 gnomeui-2 gnomevfs-2 gobject-2.0
 WANTLIB += gthread-2.0 gtk-x11-2.0 id3 intl m nghttp2 pango-1.0
 WANTLIB += pangocairo-1.0 pangoft2-1.0 popt pthread ssl ${COMPILER_LIBCXX} vte 
z
+WANTLIB += ORBitCosNaming-2 canberra dbus-1 dbus-glib-1 expat
+WANTLIB += ffi gailutil gcrypt gnome-keyring gpg-error graphite2
+WANTLIB += harfbuzz iconv ltdl lzma ncurses ogg pcre pixman-1
+WANTLIB += png pthread-stubs util vorbis vorbisfile xcb xcb-render
+WANTLIB += xcb-shm xml2
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=grip/}
+MODULES =  x11/gnome
+MODGNOME_TOOLS =   yelp desktop-file-utils
 
 LIB_DEPENDS=   audio/cdparanoia \
audio/id3lib \
@@ -32,14 +36,8 @@
x11/gnome/libgnomeui
 
 RUN_DEPENDS=   audio/vorbis-tools \
-   devel/desktop-file-utils
 
+BUILD_DEPENDS =devel/gettext-tools
 CONFIGURE_STYLE=   gnu
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
-   LDFLAGS="-L${LOCALBASE}/lib"
-
-# see patch-src_grip_c
-post-install:
-   rm -rf ${PREFIX}/share/gnome
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/audio/grip/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo17 Jan 2013 13:30:32 -  1.7
+++ distinfo28 Aug 2017 18:45:19 -
@@ -1,2 +1,2 @@
-SHA256 (grip-3.3.1.tar.gz) = 1GOUoQYu0Gb5xjOwEP0QWeY9nteRu7eoW8ZWfPD9Zv0=
-SIZE (grip-3.3.1.tar.gz) = 812562
+SHA256 (grip-3.5.2.tar.gz) = qmeTHvOoDvVzUdSHviIQsvcDCha0H/LzjSLMx21/ibc=
+SIZE (grip-3.5.2.tar.gz) = 952153
Index: patches/patch-configure
===
RCS file: /cvs/ports/audio/grip/patches/patch-configure,v
retrieving revision 1.6
diff -u -r1.6 patch-configure
--- patches/patch-configure 17 Jan 2013 13:30:32 -  1.6
+++ patches/patch-configure 28 Aug 2017 18:45:19 -
@@ -1,39 +1,13 @@
 $OpenBSD: patch-configure,v 1.6 2013/01/17 13:30:32 ajacoutot Exp $
 configure.orig Sat Jun 25 20:40:07 2005
-+++ configure  Thu Jan 17 13:44:53 2013
-@@ -4313,7 +4313,7 @@ done
- 
+Index: configure
+--- configure.orig
 configure
+@@ -4968,7 +4968,7 @@ fi
  
+ done
  
 -for ac_header in linux/soundcard.h machine/soundcard.h sys/soundcard.h 
sys/audioio.h sys/audio.io.h sun/audioio.h
 +for ac_header in soundcard.h linux/soundcard.h machine/soundcard.h 
sys/soundcard.h sys/audioio.h sys/audio.io.h sun/audioio.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -9454,7 +9454,7 @@ echo "$as_me: error: curl libs are missing" >&2;}
- fi
- 
- 
--GETTEXT_PACKAGE=grip-2.2
-+GETTEXT_PACKAGE=grip
- 
- 
- cat >>confdefs.h <<_ACEOF
-@@ -11149,7 +11149,7 @@ fi
- rm -f conftest.err conftest.$ac_objext \
-   conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_ID3Tag_Link" = no; then
--  for ac_lib in "id3 -lz -lstdc++"; do
-+  for ac_lib in "id3 -lm -lz -lstdc++"; do
- LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -11275,7 +11275,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  . conftest.id3
-+  . $srcdir/conftest.id3
-echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}"
- else
-   echo "$as_me: program exited with status $ac_status" >&5
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" 
"$ac_includes_default"
Index: patches/patch-src_Makefile_in

[UPDATE] x11/tint2 0.12.2 -> 0.14.6 passes portcheck

2017-08-28 Thread Heppler, J. Scott 

Summary so far:

1) Updated 0.12.2 - 0.14.6
2) Removed example rc files with Linux /usr/share/application path
3) Patched default tint2rc with /usr/local/share/application path.
4) Added pkg/README describing how to obtain the example *.tint2rc files
5) Searched tint2conf/main.c tint2conf/properties.c for incorrect
declaration and patched to print_t %lld (long long)
6) New tint2conf no longer needs python - removed
7) Added x11/gtk+2 as RUN_DEPENDS
8) Incorporated Valère_Monseur modifications

Concerns:
The code that incorporated the variable declarations in #4, above, was
moved several hundred lines when upstream re-wrote the tint2conf code
(python -> c).  I do not see the new @@ lines in the diff. Am I not
reading it right or missing a step for cvs'ing a modified patch?

Modified patches:
1) patch-src_tint2conf_main_c:

$OpenBSD$

Index: src/tint2conf/main.c
--- src/tint2conf/main.c.orig
+++ src/tint2conf/main.c
@@ -100,7 +100,7 @@ char *file_name_from_path(const char *filepath)

void make_backup(const char *filepath)
{
-gchar *backup_path = g_strdup_printf("%s.backup.%ld", filepath, 
time(NULL));
+gchar *backup_path = g_strdup_printf("%s.backup.%lld", filepath, (long 
long)time(NULL));
   copy_file(filepath, backup_path);
   g_free(backup_path);
}

2) patch-src_tint2conf_properties_c:

$OpenBSD$

Index: src/tint2conf/properties.c
--- src/tint2conf/properties.c.orig
+++ src/tint2conf/properties.c
@@ -180,7 +180,7 @@ void applyClicked(GtkWidget *widget, gpointer data)
   gchar *filepath = get_current_theme_path();
   if (filepath) {
   if (config_is_manual(filepath)) {
-gchar *backup_path = g_strdup_printf("%s.backup.%ld", filepath, 
time(NULL));
+gchar *backup_path = g_strdup_printf("%s.backup.%lld", filepath, 
(long long)time(NULL));
   copy_file(filepath, backup_path);
   g_free(backup_path);
   }

Runs on amd64.  Soliciting accurate comments/feedback with the goal of
commiting in time for 6.2

J. Scott Heppler

Attached diff:
Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- Makefile26 Nov 2016 02:06:16 -  1.5
+++ Makefile28 Aug 2017 16:37:12 -
@@ -2,13 +2,11 @@
 
 COMMENT=freedesktop-compliant panel
 
-V= 0.12.2
-REVISION=  2
+V= 0.14.6
 CATEGORIES=x11
 DISTNAME=  tint2-$V
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-dc300c021531f47cca336e15b50adf3b4a9bc9ae
-INSTDIR=   ${PREFIX}/tint2
+WRKDIST=   ${WRKDIR}/tint2-v$V-8046600a552774253939b8a83bdd3fc0e60dacec
 
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
 
@@ -25,30 +23,26 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 p
 WANTLIB += z
 
 BUILD_DEPENDS= devel/gettext-tools
-LIB_DEPENDS=   graphics/imlib2 \
-   devel/gettext \
+
+LIB_DEPENDS=   devel/gettext \
devel/pango \
devel/startup-notification \
+graphics/imlib2 \
x11/gnome/librsvg \
x11/gtk+2
-RUN_DEPENDS=   x11/py-gtk2 \
-   devel/desktop-file-utils
+
+RUN_DEPENDS=   x11/gtk+2
 
 MODULES=   devel/cmake \
-   lang/python \
x11/gnome
 
-MODGNOME_TOOLS+= gtk-update-icon-cache
+MODGNOME_TOOLS+= desktop-file-utils \
+   gtk-update-icon-cache \
+   shared-mime-info
 
 NO_TEST=   Yes
 
-CONFIGURE_ARGS= -DMANDIR="${PREFIX}/man"
-
 post-install:
-   cp -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/tint2/
-   sed -i -e '/\/usr\/local\/share\/applications/d' -e \
-   's,/usr/share/applications,${LOCALBASE}/share/applications,g' \
-   ${PREFIX}/share/examples/tint2/*tint2rc
-   rm ${PREFIX}/share/tint2/*.tint2rc
+   rm ${PREFIX}/share/examples/tint2/*.tint2rc
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo11 Sep 2015 14:14:07 -  1.1.1.1
+++ distinfo28 Aug 2017 16:37:12 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-0.12.2.tar.gz) = vanMkT1Ln9QTKF6jRGasFJVZ6emTjhKfRqZkwxEBM0U=
-SIZE (tint2-0.12.2.tar.gz) = 229320
+SHA256 (tint2-0.14.6.tar.gz) = F3Dio33IBmozr3OFuhu+dAUQG87Y6fx+6V1IzvU801E=
+SIZE (tint2-0.14.6.tar.gz) = 466533
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt28 Aug 2017 16:37:12 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -257,7 +257,7 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
+ install( TARGETS tint2 DESTINATION bin

UPDATE: sysutils/pick

2017-08-28 Thread Anton Lindqvist 
Hi,
Update pick to 1.8.0 from maintainer, the complete changelog can be
found here[1] and the most important changes below:

New features:

- Read arrow keys from the terminfo(3) database.

- Add support for SIGWINCH.

Bug fixes:

- Declare functions as __dead when appropriate in pick-test(1).
  Discovered while compiling using GCC 7.

- Make sure $IFS is not an empty string.

- Disable IEXTEN to solve Ctrl-V conflict.

- Declare functions as __dead in pick(1) when appropriate.

- Always pass 9 parameters to tparm(3). Partial fix to make pick compile
  on NetBSD.

- Ensure blocking read in non-canonical mode.

- Prefix UP (and DOWN for consistency) since it's already defined on
  NetBSD. Partial fix to make pick compile on NetBSD.

- Use compound-list in pick-test.sh for POSIX compatibility.

- Fix and simplify horisontal scrolling.

- Fix scroll up bug.

- Always favor the shortest match.
  This bug only occurs when a choice contains multiple instances of the
  query and the right-most match is the shortest one.

Comments? OK?

[1] https://github.com/calleerlandsson/pick/releases/tag/v1.8.0

Index: Makefile
===
RCS file: /cvs/ports/sysutils/pick/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile2 Jul 2017 19:37:22 -   1.4
+++ Makefile28 Aug 2017 15:27:29 -
@@ -2,7 +2,7 @@
 
 COMMENT =  fuzzy select anything
 
-V =1.7.0
+V =1.8.0
 DISTNAME = pick-${V}
 
 CATEGORIES =   sysutils
Index: distinfo
===
RCS file: /cvs/ports/sysutils/pick/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo2 Jul 2017 19:37:22 -   1.3
+++ distinfo28 Aug 2017 15:27:29 -
@@ -1,2 +1,2 @@
-SHA256 (pick-1.7.0.tar.gz) = lQUxxW7cS+N1/k6JKRyqgHMispgUMEPi4pY9406W3hU=
-SIZE (pick-1.7.0.tar.gz) = 101443
+SHA256 (pick-1.8.0.tar.gz) = eDTTrvnldc4HQU+WHR8CR3a0m7I8XcO3u49rc0ExBn0=
+SIZE (pick-1.8.0.tar.gz) = 101366

Re: UPDATE: php revamp

2017-08-28 Thread Stuart Henderson 
5.3/5.4 got upgraded via @pkgpath when they stopped being the "main" ports 
version of php. 5.5 isn't going to be installed via dependencies any more 
so people who installed it will have asked for it specifically, so it 
doesn't make much sense to auto update it via @pkgpath, so adding a quirk 
to say that it's obsolete is going to be enough and is fairly simple.


--
 Sent from a phone, apologies for poor formatting.



On 28 August 2017 2:56:44 pm Martijn van Duren 
 wrote:



On 08/28/17 14:02, Stuart Henderson wrote:

On 2017/08/27 19:37, Martijn van Duren wrote:

On 08/27/17 19:31, Robert Nagy wrote:
Yeah let's keep php as is for 6.2, you can remove 5.5 and add 7.1 but 
that's it.

After unlock we can unleash hell on the tree.


Then I'd like to propose to just remove 5.5.

Adding 7.1 would either backporting extra fixes from my patch, or keep it close
to the way 7.0 is right now (including some ugly hacks in Makefile.inc), which
would further complicate things for me later on.

OK?


OK as far as it goes, but it needs quirks parts too.


I'm not quite clear on the quirks part:
The removal of PHP 5.3 and 5.4 don't seem to have any quirks entry
(based on both Quirks.pm and ports-changes@) and Quirks.pm doesn't seem
to have any transition based upon the removal of a specific version. So
what would these entries look like (if still applicable), and should it
be based on a removal (obsolete_reason), or a transition to 5.6
(stem_extensions)?



martijn@


On (2017-08-27 13:50), Stuart Henderson wrote:

I would be ok with killing 5.5 and adding 7.1 but think it's the wrong time
in the release cycle for anything more complex.
--
 Sent from a phone, apologies for poor formatting.




Index: Makefile
===
RCS file: /cvs/ports/lang/php/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile28 Apr 2016 18:19:23 -  1.11
+++ Makefile27 Aug 2017 17:36:28 -
@@ -1,7 +1,6 @@
 # $OpenBSD: Makefile,v 1.11 2016/04/28 18:19:23 sthen Exp $

 SUBDIR =
-SUBDIR += 5.5
 SUBDIR += 5.6
 SUBDIR += 7.0

Index: Makefile.inc
===
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.96
diff -u -p -r1.96 Makefile.inc
--- Makefile.inc24 Aug 2017 10:03:25 -  1.96
+++ Makefile.inc27 Aug 2017 17:36:28 -
@@ -78,11 +78,7 @@ CONFIGURE_ARGS+= --enable-shared \
--enable-sqlite-utf8 \
--with-sqlite3 \
--program-suffix=-${PV}
-
-# readline is broken in PHP-5.3
-.if ${PV} != 5.3
 CONFIGURE_ARGS +=  --with-readline
-.endif

 # apache module
 CONFIGURE_ARGS+=   --with-apxs2=${LOCALBASE}/sbin/apxs2
@@ -221,10 +217,8 @@ MULTI_PACKAGES+=   -odbc
 COMMENT-odbc=  odbc database access extensions for php5
 CONFIGURE_ARGS+=--with-iodbc=shared,${LOCALBASE}
 LIB_DEPENDS-odbc=  databases/iodbc
-WANTLIB-odbc=  iodbc>=2 pthread
-.if ${PV} != "5.3"
-WANTLIB-odbc+= iodbcinst
-.endif
+WANTLIB-odbc=  iodbc>=2 pthread \
+   iodbcinst

 # pcntl
 MULTI_PACKAGES+=   -pcntl
@@ -347,7 +341,6 @@ PHPXS_SUBST+= -e 's,${i},${${i}},'
 WANTLIB-main+= c crypto iconv intl lzma m pthread ssl xml2>=8 z
 WANTLIB-main+= ncurses readline ${COMPILER_LIBCXX}

-# php 5.4/5.5 : WANTLIB-main += ${COMPILER_LIBCXX}
 WANTLIB-fastcgi=   ${WANTLIB-main}
 LIB_DEPENDS-main=  devel/gettext \
textproc/libxml
@@ -384,11 +377,7 @@ pre-configure:
 MODULE_NAME-${i}=  ${i}
 DESCR-${i}=${.CURDIR}/../files/DESCR-${i}
 PKGNAME-${i}=  php-${i}-${V}
-.if ${V:M5.4*}
-PKGSPEC-${i}=  php-${i}->=5.4,<5.5
-.elif ${V:M5.5*}
-PKGSPEC-${i}=  php-${i}->=5.5,<5.6
-.elif ${V:M5.6*}
+.if ${V:M5.6*}
 PKGSPEC-${i}=  php-${i}->=5.6,<5.7
 .elif ${V:M7.0*}
 PKGSPEC-${i}=  php-${i}->=7.0,<7.1

Re: UPDATE: php revamp

2017-08-28 Thread Gonzalo L. Rodriguez 
Initial test on nextcloud looks good.

Thanks!

Ok so far.

On [27/08/17] [07:37P], Martijn van Duren wrote:
; On 08/27/17 19:31, Robert Nagy wrote:
; > Yeah let's keep php as is for 6.2, you can remove 5.5 and add 7.1 but 
that's it.
; > After unlock we can unleash hell on the tree.
; 
; Then I'd like to propose to just remove 5.5.
; 
; Adding 7.1 would either backporting extra fixes from my patch, or keep it 
close
; to the way 7.0 is right now (including some ugly hacks in Makefile.inc), which
; would further complicate things for me later on.
; 
; OK?
; 
; martijn@
; > 
; > On (2017-08-27 13:50), Stuart Henderson wrote:
; >> I would be ok with killing 5.5 and adding 7.1 but think it's the wrong time
; >> in the release cycle for anything more complex.
; >> -- 
; >>  Sent from a phone, apologies for poor formatting.
; >>
; >>
; >>
; Index: Makefile
; ===
; RCS file: /cvs/ports/lang/php/Makefile,v
; retrieving revision 1.11
; diff -u -p -r1.11 Makefile
; --- Makefile  28 Apr 2016 18:19:23 -  1.11
; +++ Makefile  27 Aug 2017 17:36:28 -
; @@ -1,7 +1,6 @@
;  # $OpenBSD: Makefile,v 1.11 2016/04/28 18:19:23 sthen Exp $
;  
;  SUBDIR =
; -SUBDIR += 5.5
;  SUBDIR += 5.6
;  SUBDIR += 7.0
;  
; Index: Makefile.inc
; ===
; RCS file: /cvs/ports/lang/php/Makefile.inc,v
; retrieving revision 1.96
; diff -u -p -r1.96 Makefile.inc
; --- Makefile.inc  24 Aug 2017 10:03:25 -  1.96
; +++ Makefile.inc  27 Aug 2017 17:36:28 -
; @@ -78,11 +78,7 @@ CONFIGURE_ARGS+=   --enable-shared \
;   --enable-sqlite-utf8 \
;   --with-sqlite3 \
;   --program-suffix=-${PV}
; -
; -# readline is broken in PHP-5.3
; -.if ${PV} != 5.3
;  CONFIGURE_ARGS +=--with-readline
; -.endif
;  
;  # apache module
;  CONFIGURE_ARGS+= --with-apxs2=${LOCALBASE}/sbin/apxs2
; @@ -221,10 +217,8 @@ MULTI_PACKAGES+= -odbc
;  COMMENT-odbc=odbc database access extensions for php5
;  CONFIGURE_ARGS+=--with-iodbc=shared,${LOCALBASE}
;  LIB_DEPENDS-odbc=databases/iodbc
; -WANTLIB-odbc=iodbc>=2 pthread
; -.if ${PV} != "5.3"
; -WANTLIB-odbc+=   iodbcinst
; -.endif
; +WANTLIB-odbc=iodbc>=2 pthread \
; + iodbcinst
;  
;  # pcntl
;  MULTI_PACKAGES+= -pcntl
; @@ -347,7 +341,6 @@ PHPXS_SUBST+= -e 's,${i},${${i}},'
;  WANTLIB-main+=   c crypto iconv intl lzma m pthread ssl xml2>=8 z
;  WANTLIB-main+=   ncurses readline ${COMPILER_LIBCXX}
;  
; -# php 5.4/5.5 : WANTLIB-main += ${COMPILER_LIBCXX}
;  WANTLIB-fastcgi= ${WANTLIB-main}
;  LIB_DEPENDS-main=devel/gettext \
;   textproc/libxml
; @@ -384,11 +377,7 @@ pre-configure:
;  MODULE_NAME-${i}=${i}
;  DESCR-${i}=  ${.CURDIR}/../files/DESCR-${i}
;  PKGNAME-${i}=php-${i}-${V}
; -.if ${V:M5.4*}
; -PKGSPEC-${i}=php-${i}->=5.4,<5.5
; -.elif ${V:M5.5*}
; -PKGSPEC-${i}=php-${i}->=5.5,<5.6
; -.elif ${V:M5.6*}
; +.if ${V:M5.6*}
;  PKGSPEC-${i}=php-${i}->=5.6,<5.7
;  .elif ${V:M7.0*}
;  PKGSPEC-${i}=php-${i}->=7.0,<7.1
; 

-- 
Sending from my toaster.

Re: ffmpeg hang on 6.1-stable and -current with certain video files

2017-08-28 Thread Marcus MERIGHI 
fr...@frankgroeneveld.nl (Frank Groeneveld), 2017.08.28 (Mon) 14:33 (CEST):
> When I try to convert certain video files using ffmpeg from ports on
> 6.1-stable or -current it randomly hangs about one in three or four
> tries. I've uploaded a sample movie at:
> https://ivaldi.nl/wp-content/uploads/sample.mp4
> 
> The following command reproduces the problem:
> ffmpeg -i sample.mp4 -acodec aac -strict experimental -vf
> scale=1280:720,setdar=2:1 -y output.mp4
> 
> This is the output when it hangs: https://pastebin.com/mb0X3hU3
> The process uses 100% cpu and doesn't seem to do anything else, the
> output file doesn't grow either.

I am seeing something with the same symptoms. I need to start
transcoding anywhere from one- to five times.

$ nice ffmpeg -n -stats -loglevel warning -threads 2 -ss 10 \
  -i "input.mov" -map_metadata 0:s:0 -c:v libx264 -preset slow -crf 23 \
  -c:a aac -b:a 192k -pix_fmt yuvj420p output.mov

Marcus

OpenBSD 6.1-current (GENERIC.MP) #7: Tue Aug 15 21:08:10 MDT 2017
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 8451125248 (8059MB)
avail mem = 8187994112 (7808MB)
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.6 @ 0xdae9c000 (66 entries)
bios0: vendor LENOVO version "8DET73WW (1.43 )" date 10/12/2016
bios0: LENOVO 429135G
acpi0 at bios0: rev 2
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP SLIC SSDT SSDT SSDT HPET APIC MCFG ECDT ASF! TCPA SSDT 
SSDT DMAR UEFI UEFI UEFI
acpi0: wakeup devices LID_(S3) SLPB(S3) IGBE(S4) EXP4(S4) EXP7(S4) EHC1(S3) 
EHC2(S3) HDEF(S4)
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpihpet0 at acpi0: 14318179 Hz
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: Intel(R) Core(TM) i7-2620M CPU @ 2.70GHz, 2691.67 MHz
cpu0: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,SENSOR,ARAT
cpu0: 256KB 64b/line 8-way L2 cache
cpu0: TSC frequency 2691670230 Hz
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 10 var ranges, 88 fixed ranges
cpu0: apic clock running at 99MHz
cpu0: mwait min=64, max=64, C-substates=0.2.1.1.2, IBE
cpu1 at mainbus0: apid 1 (application processor)
cpu1: Intel(R) Core(TM) i7-2620M CPU @ 2.70GHz, 2691.26 MHz
cpu1: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,SENSOR,ARAT
cpu1: 256KB 64b/line 8-way L2 cache
cpu1: smt 1, core 0, package 0
cpu2 at mainbus0: apid 2 (application processor)
cpu2: Intel(R) Core(TM) i7-2620M CPU @ 2.70GHz, 2691.26 MHz
cpu2: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,SENSOR,ARAT
cpu2: 256KB 64b/line 8-way L2 cache
cpu2: smt 0, core 1, package 0
cpu3 at mainbus0: apid 3 (application processor)
cpu3: Intel(R) Core(TM) i7-2620M CPU @ 2.70GHz, 2691.26 MHz
cpu3: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,SENSOR,ARAT
cpu3: 256KB 64b/line 8-way L2 cache
cpu3: smt 1, core 1, package 0
ioapic0 at mainbus0: apid 2 pa 0xfec0, version 20, 24 pins
acpimcfg0 at acpi0 addr 0xf800, bus 0-63
acpiec0 at acpi0
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus -1 (PEG_)
acpiprt2 at acpi0: bus 2 (EXP1)
acpiprt3 at acpi0: bus 3 (EXP2)
acpiprt4 at acpi0: bus -1 (EXP4)
acpiprt5 at acpi0: bus 13 (EXP5)
acpiprt6 at acpi0: bus 14 (EXP7)
acpicpu0 at acpi0: C3(350@104 io@0x415), C1(1000@1 halt), PSS
acpicpu1 at acpi0: C3(350@104 io@0x415), C1(1000@1 halt), PSS
acpicpu2 at acpi0: C3(350@104 io@0x415), C1(1000@1 halt), PSS
acpicpu3 at acpi0: C3(350@104 io@0x415), C1(1000@1 halt), PSS
acpipwrres0 at acpi0: PUBS, resource for EHC1, EHC2
acpitz0 at acpi0: critical temperature is 99 degC
acpibtn0 at acpi0: LID_
acpibtn1 at acpi0: SLPB
"LEN0020" at acpi0 not configured
acpibat0 at acpi0: BAT0 model "45N1172" serial 13541 type LION oem "SANYO"
acpiac0 at acpi0: AC unit online
acpithinkpad0 at acpi0
"PNP0C14" at acpi0 not configured
"PNP0C14" at acpi0 not configured
acpidock0 at acpi0: GDCK not docked (0)
acpivideo0 at acpi0: VID_
acpivout at acpivideo0 not configured
acpivideo1 at acpi0: VID_
cpu0: Enhanced SpeedStep 2691 MHz: speeds: 2701, 2700, 2400, 2200, 2000, 1800, 
1600, 1400,

UPDATE: games/openrct2 0.1.0 => 0.1.1

2017-08-28 Thread Brian Callahan 

Hi ports --

Attached is an update to games/openrct2. It is mostly a bugfix update.
Upstream now offers the choice to have a static or shared libopenrct2, 
which it seems that the default cmake flags on OpenBSD gets us a static 
library. It doesn't matter much to me either way, as I can't imagine 
anything ever linking to libopenrct2 except for the openrct2 binary. The 
static library does simply the port a tiny bit on the plus side.


Works well here.

OK?

~Brian

Index: Makefile
===
RCS file: /cvs/ports/games/openrct2/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Makefile	15 Aug 2017 01:07:45 -	1.4
+++ Makefile	28 Aug 2017 14:37:05 -
@@ -1,12 +1,9 @@
 # $OpenBSD: Makefile,v 1.4 2017/08/15 01:07:45 naddy Exp $
 
-V =		0.1.0
+V =		0.1.1
 COMMENT =	open source re-implementation of RollerCoaster Tycoon 2
 DISTNAME =	openrct2-${V}
 CATEGORIES =	games x11
-REVISION =	1
-
-SHARED_LIBS +=	openrct2  1.0 # 1.0
 
 HOMEPAGE =	https://openrct2.org/
 MAINTAINER =	Brian Callahan 
@@ -23,7 +20,7 @@ WANTLIB += ${COMPILER_LIBCXX}
 MASTER_SITES =	https://devio.us/~bcallah/source/
 
 # Doesn't build with gcc-4.9.4
-COMPILER =	clang
+COMPILER =	base-clang ports-clang
 
 MODULES =	devel/cmake
 
@@ -39,8 +36,7 @@ RUN_DEPENDS =	devel/desktop-file-utils \
 		x11/gtk+3,-guic
 
 # -DOPENRCT2_COMMIT_SHA1_SHORT is a lie but still useful.
-CONFIGURE_ARGS =	-DCMAKE_SHARED_LINKER_FLAGS="-L${X11BASE}/lib" \
-			-DDOWNLOAD_TITLE_SEQUENCES=OFF \
+CONFIGURE_ARGS =	-DDOWNLOAD_TITLE_SEQUENCES=OFF \
 			-DOPENRCT2_BRANCH=master \
 			-DOPENRCT2_COMMIT_SHA1_SHORT=`date +%Y%m%d`
 
@@ -48,9 +44,7 @@ CONFIGURE_ARGS =	-DCMAKE_SHARED_LINKER_F
 NO_TEST =	Yes
 
 pre-configure:
-	sed -i -e 's,$${LIBopenrct2_VERSION},${LIBopenrct2_VERSION},g' \
-		-e 's,-Werror,,g' \
-		${WRKSRC}/src/openrct2/CMakeLists.txt
+	sed -i 's,-Werror,,g' ${WRKSRC}/src/openrct2/CMakeLists.txt
 	sed -i 's,/usr/local,${TRUEPREFIX},g' \
 		${WRKSRC}/src/openrct2/platform/linux.c
 
Index: distinfo
===
RCS file: /cvs/ports/games/openrct2/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo	20 Jul 2017 17:06:48 -	1.2
+++ distinfo	28 Aug 2017 14:37:05 -
@@ -1,2 +1,2 @@
-SHA256 (openrct2-0.1.0.tar.gz) = xB8Tji7wD+j/o4CPKnjorggD5XWqQ1z9jX1wE2FmyGc=
-SIZE (openrct2-0.1.0.tar.gz) = 8006116
+SHA256 (openrct2-0.1.1.tar.gz) = G15uPhmW+rXQBZhKgZJYoeODLuLCvEZuyJR445aTR9k=
+SIZE (openrct2-0.1.1.tar.gz) = 8033025
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/games/openrct2/patches/patch-CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt	28 Jun 2017 16:43:46 -	1.1.1.1
+++ patches/patch-CMakeLists_txt	28 Aug 2017 14:37:05 -
@@ -1,12 +1,11 @@
 $OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2017/06/28 16:43:46 bcallah Exp $
 
-Don't gzip man page and put it in the right place.
 Don't try to execute git.
 
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -20,33 +20,9 @@ option(PORTABLE "Create a portable build (-rpath=$ORIG
+@@ -23,33 +23,9 @@ option(PORTABLE "Create a portable build (-rpath=$ORIG
  option(DOWNLOAD_TITLE_SEQUENCES "Download title sequences during installation." ON)
  
  # Define current git branch
@@ -40,10 +39,3 @@ Index: CMakeLists.txt
  
  # Tagged builds are not meant to display commit info
  if (NOT OPENRCT2_COMMIT_SHA1_SHORT STREQUAL "HEAD")
-@@ -154,5 +130,4 @@ install(FILES "resources/logo/icon_x128.png" DESTINATI
- install(FILES "resources/logo/icon_x256.png" DESTINATION "share/icons/hicolor/256x256/apps" RENAME "openrct2.png")
- install(FILES "resources/logo/icon_flag.svg" DESTINATION "share/icons/hicolor/scalable/apps" RENAME "openrct2.svg")
- install(FILES "distribution/linux/openrct2.desktop" DESTINATION "share/applications")
--install(DIRECTORY "distribution/man/" DESTINATION "share/man/man6" FILES_MATCHING PATTERN "*.6")
--install(CODE "execute_process(COMMAND find \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/man/man6 -type f -exec gzip -f \"{}\" \;)")
-+install(DIRECTORY "distribution/man/" DESTINATION "man/man6" FILES_MATCHING PATTERN "*.6")
Index: patches/patch-src_openrct2_CMakeLists_txt
===
RCS file: /cvs/ports/games/openrct2/patches/patch-src_openrct2_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_openrct2_CMakeLists_txt
--- patches/patch-src_openrct2_CMakeLists_txt	28 Jun 2017 16:43:46 -	1.1.1.1
+++ patches/patch-src_openrct2_CMakeLists_txt	28 Aug 2017 14:37:05 -
@@ -1,20 +1,11 @@
 $OpenBSD: patch-src_openrct2_CMakeLists_txt,v 1.1.1.1 2017/06/28 16:43:46 bcallah Exp $
 
-Version the SO.
 Don't define DEBUG.
 
 Index: src/openrct2/CMakeLists.txt
 ---

UPDATE: www/uget 2.0.9 => 2.0.10

2017-08-28 Thread Brian Callahan 

Hi ports --

Attached is an update to www/uget. It is mostly a bugfix update.
Works well here.

OK?

~Brian

Index: Makefile
===
RCS file: /cvs/ports/www/uget/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- Makefile	7 Jun 2017 03:02:29 -	1.16
+++ Makefile	28 Aug 2017 14:40:34 -
@@ -1,11 +1,11 @@
 # $OpenBSD: Makefile,v 1.16 2017/06/07 03:02:29 benoit Exp $
 
 COMMENT =	lightweight graphical download manager
-DISTNAME =	uget-2.0.9
+DISTNAME =	uget-2.0.10
 CATEGORIES =	www net x11
 
 HOMEPAGE =	http://ugetdm.com/
-MAINTAINER =	Brian Callahan 
+MAINTAINER =	Brian Callahan 
 
 # LGPLv2.1+
 PERMIT_PACKAGE_CDROM =	Yes
Index: distinfo
===
RCS file: /cvs/ports/www/uget/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- distinfo	7 Jun 2017 03:02:29 -	1.8
+++ distinfo	28 Aug 2017 14:40:34 -
@@ -1,2 +1,2 @@
-SHA256 (uget-2.0.9.tar.gz) = VQHB0MF+Lntonqrq6VnWycH3hV2vgghoWO/LHk1CCNY=
-SIZE (uget-2.0.9.tar.gz) = 933261
+SHA256 (uget-2.0.10.tar.gz) = CnWL6FVO+699dGj4l7UoUyGY/4EpBtgkqrf3gXzUjf4=
+SIZE (uget-2.0.10.tar.gz) = 949687
Index: patches/patch-ui-gtk_UgtkSetting_c
===
RCS file: /cvs/ports/www/uget/patches/patch-ui-gtk_UgtkSetting_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-ui-gtk_UgtkSetting_c
--- patches/patch-ui-gtk_UgtkSetting_c	30 May 2016 18:31:39 -	1.1
+++ patches/patch-ui-gtk_UgtkSetting_c	28 Aug 2017 14:40:34 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-ui-gtk_UgtkSetting_c,v 1.1 2016/05/30 18:31:39 juanfra Exp $
 ui-gtk/UgtkSetting.c.orig	Sun May 29 23:19:14 2016
-+++ ui-gtk/UgtkSetting.c	Sun May 29 23:20:20 2016
-@@ -49,9 +49,7 @@
+Index: ui-gtk/UgtkSetting.c
+--- ui-gtk/UgtkSetting.c.orig
 ui-gtk/UgtkSetting.c
+@@ -48,9 +48,7 @@
  
  #define UGTK_ARIA2_PATH"aria2c"
  
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/uget/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST	29 May 2016 13:59:01 -	1.5
+++ pkg/PLIST	28 Aug 2017 14:40:34 -
@@ -45,11 +45,13 @@ share/locale/hr/LC_MESSAGES/uget.mo
 share/locale/hu/LC_MESSAGES/uget.mo
 share/locale/id/LC_MESSAGES/uget.mo
 share/locale/it/LC_MESSAGES/uget.mo
+share/locale/ja/LC_MESSAGES/uget.mo
 share/locale/ka_GE/
 share/locale/ka_GE/LC_MESSAGES/
 share/locale/ka_GE/LC_MESSAGES/uget.mo
 share/locale/kk/LC_MESSAGES/uget.mo
 share/locale/ku/LC_MESSAGES/uget.mo
+share/locale/lt/LC_MESSAGES/uget.mo
 share/locale/or_IN/
 share/locale/or_IN/LC_MESSAGES/
 share/locale/or_IN/LC_MESSAGES/uget.mo

Re: Remaining clang fallout (amd64 2017-08-27)

2017-08-28 Thread Christian Weisgerber 
Christian Weisgerber:

> These ports still fail to build on amd64 after the clang switch:
> 
> devel/ti-msp430gcc
> editors/TeXmacs
> emulators/emulationstation
> games/frozen-bubble
> games/vacuum
> multimedia/avidemux

PS:
Logs at
http://build-failures.rhaalovely.net/amd64/2017-08-27/

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

Remaining clang fallout (amd64 2017-08-27)

2017-08-28 Thread Christian Weisgerber 
These ports still fail to build on amd64 after the clang switch:

devel/ti-msp430gcc
editors/TeXmacs
emulators/emulationstation
games/frozen-bubble
games/vacuum
multimedia/avidemux

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

CVS: cvs.openbsd.org: ports

2017-08-28 Thread Jeremy Evans 
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2017/08/28 08:04:58

Modified files:
devel/vim-command-t: Makefile 

Log message:
Keep vim-command-t ruby version in sync with vim ruby version, switching
it to use the default ruby version.  The versions will automatically
be kept in sync in the future since they use the default ruby version.

CVS: cvs.openbsd.org: ports

2017-08-28 Thread Jeremy Evans 
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2017/08/28 08:01:34

Modified files:
editors/vim: Makefile 

Log message:
Make ruby FLAVOR use default ruby version instead of ruby 1.8.

OK and feedback sthen@

CVS: cvs.openbsd.org: ports

2017-08-28 Thread Jeremy Evans 
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2017/08/28 07:58:05

Modified files:
devel/subversion: Makefile 
devel/subversion/patches: patch-configure_ac 

Log message:
Make subversion's ruby bindings use the default ruby version instead of
ruby 1.8.

OK stsp@

Re: [update] yle-dl-2.23

2017-08-28 Thread Timo Myyrä 
Stuart Henderson  writes:

> On 2017/08/28 08:20, Timo Myyrä wrote:
>> Hi,
>> 
>> Here's an a bit due update to yle-dl. The source structure has changed a bit.
>
> Tweaked diff; use ports GH_* infrastructure and MODPY_EGG_VERSION,
> enable tests, update license marker according to setup.py's License:
> line.
>
> But before it can be committed, we need a port of py-progress.
>
>> The patches directory is not needed anymore but that change isn't reflected 
>> on
>> the diff. Any ideas how to include that?
>
> CVS doesn't allow removing directories. The closest you get is -P on
> update/checkout.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/multimedia/yle-dl/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile  23 Mar 2017 01:35:37 -  1.12
> +++ Makefile  28 Aug 2017 12:10:37 -
> @@ -1,9 +1,12 @@
>  # $OpenBSD: Makefile,v 1.12 2017/03/23 01:35:37 jca Exp $
>  
> -V =  2.15
> +GH_ACCOUNT = aajanki
> +GH_PROJECT = yle-dl
> +GH_TAGNAME = 2.23
> +MODPY_EGG_VERSION =  ${GH_TAGNAME}
> +
>  COMMENT =download videos from YLE Areena
> -DISTNAME =   aajanki-yle-$V
> -PKGNAME =yle-dl-$V
> +
>  CATEGORIES = multimedia
>  
>  HOMEPAGE =   http://aajanki.github.io/yle-dl/
> @@ -12,32 +15,21 @@ MAINTAINER =  Timo Myyra   # GPLv3
>  PERMIT_PACKAGE_CDROM =   Yes
>  
> -MASTER_SITES =   https://github.com/aajanki/yle-dl/tarball/${V}/
> -
>  MODULES =lang/python \
>   lang/php
>  
> -RUN_DEPENDS =net/rtmpdump \
> +TEST_DEPENDS =   ${RUN_DEPENDS}
> +RUN_DEPENDS =devel/py-progress \
> + net/rtmpdump \
>   security/py-crypto \
> + www/py-requests \
>   lang/php/${MODPHP_VERSION},-curl \
>   lang/php/${MODPHP_VERSION},-mcrypt
>  
> -NO_TEST =Yes
> -
> -WRKDIST =${WRKDIR}/aajanki-yle-dl-e188267
> -
>  MODPY_SETUPTOOLS =   Yes
> -MODPY_ADJ_FILES =yle-dl
>  MODPHP_BUILDDEP =No
>  
> -SUBST_VARS +=MODPHP_BIN
> -
> -do-install:
> - ${SUBST_PROGRAM} ${WRKSRC}/yle-dl ${PREFIX}/bin/yle-dl
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/yle-dl
> - ${INSTALL_DATA} ${WRKSRC}/AdobeHDS.php ${PREFIX}/share/yle-dl
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/yle-dl
> - ${INSTALL_DATA} ${WRKSRC}/COPYING ${WRKSRC}/README.fi \
> - ${WRKSRC}/README.md ${PREFIX}/share/doc/yle-dl
> +pre-configure:
> + @sed -i -e "s,'php','${MODPHP_BIN}',g" ${WRKSRC}/yledl/downloaders.py
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/multimedia/yle-dl/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo
> --- distinfo  19 Mar 2017 20:28:07 -  1.8
> +++ distinfo  28 Aug 2017 12:10:37 -
> @@ -1,2 +1,2 @@
> -SHA256 (aajanki-yle-2.15.tar.gz) = 
> FHEXm1OG2njar5LkJTQ+rHPKVLXRgfitjToLrHfCurs=
> -SIZE (aajanki-yle-2.15.tar.gz) = 58040
> +SHA256 (yle-dl-2.23.tar.gz) = dK06TgOLinSkIXUy19XDn+Ec8y4pPbhrn46knTj9FBk=
> +SIZE (yle-dl-2.23.tar.gz) = 62337
> Index: patches/patch-yle-dl
> ===
> RCS file: patches/patch-yle-dl
> diff -N patches/patch-yle-dl
> --- patches/patch-yle-dl  19 Mar 2017 20:28:07 -  1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,21 +0,0 @@
> -$OpenBSD: patch-yle-dl,v 1.3 2017/03/19 20:28:07 benoit Exp $
>  yle-dl.orig  Mon Mar 13 06:36:30 2017
> -+++ yle-dl   Mon Mar 13 06:37:05 2017
> -@@ -74,7 +74,7 @@ excludechars_linux = '*/|'
> - excludechars_windows = '\"*/:<>?|'
> - excludechars = excludechars_linux
> - rtmpdump_binary = None
> --hds_binary = ['php', '/usr/local/share/yle-dl/AdobeHDS.php']
> -+hds_binary = ['${MODPHP_BIN}', '/usr/local/share/yle-dl/AdobeHDS.php']
> - stream_proxy = None
> - 
> - libcname = ctypes.util.find_library('c')
> -@@ -132,7 +132,7 @@ def usage():
> - log('--rtmpdump path Set path to rtmpdump binary')
> - log('--adobehds cmd  Set command for executing AdobeHDS.php '
> - 'script')
> --log('Default: "php '
> -+log('Default: "${MODPHP_BIN} '
> - '/usr/local/share/yle-dl/AdobeHDS.php"')
> - log('--postprocess cmd   Execute a command cmd after a successful '
> - 'download.')
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/multimedia/yle-dl/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 1 Sep 2016 13:33:05 -   1.3
> +++ pkg/PLIST 28 Aug 2017 12:10:37 -
>

Re: Remove www/puppet-dashboard?

2017-08-28 Thread Sebastian Reitenbach 
Hi,

On Monday, August 28, 2017 03:11 CEST, Jeremy Evans  wrote:

> puppet-dashboard is one of the only remaining ports still depending on
> ruby 1.8.
>
> Embeds Rails 2.3.17, released in Feburary 2013, and many other ruby
> libraries of similar vintage.  I'm not sure it's actually vulnerable to
> any of the many Rails vulnerabilities announced since, but it wouldn't
> surprise me.
>
> Port doesn't actually build anything, it basically just untars and
> retars the distfile, other than fixing shebang lines and changing
> some hardcoded paths.  I think removing it using the following quirk
> makes sense:
>
> "web application with no benefit being packaged"
>
> OKs to remove?

IIRC, I asked quite some time ago, but at thta time, someone was still using it.
But removing it is fine with me, puppetboard is a nice alternative ;)

Sebastian

>
> Thanks,
> Jeremy

CVS: cvs.openbsd.org: ports

2017-08-28 Thread Kurt Miller 
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/08/28 07:15:55

Removed files:
devel/jdk/1.7  : Makefile distinfo 
devel/jdk/1.7/files: PLATFORM_API_BSDOS_PCM.c cacerts 
devel/jdk/1.7/patches: patch-hotspot_make_bsd_makefiles_gcc_make 
   patch-jdk_make_com_sun_java_pack_Makefile 
   
patch-jdk_make_com_sun_java_pack_mapfile-vers-unpack200 
   patch-jdk_make_common_shared_Sanity_gmk 
   patch-jdk_make_javax_sound_FILES_c_gmk 
   patch-jdk_make_javax_sound_Makefile 
   
patch-jdk_make_tools_src_build_tools_generatecurrencydata_GenerateCurrencyData_java
 
   
patch-jdk_src_macosx_classes_java_lang_ClassLoaderHelper_java 
   
patch-jdk_src_share_classes_sun_applet_AppletPanel_java 
   
patch-jdk_src_share_classes_sun_applet_AppletViewerPanel_java 
   
patch-jdk_src_share_native_com_sun_media_sound_Platform_c 
   
patch-jdk_src_solaris_classes_sun_awt_X11_XWM_java 
   patch-langtools_make_build_xml 
devel/jdk/1.7/pkg: DESCR-jre DESCR-main PFRAG.client_vm-jre 
   PFRAG.client_vm-main PLIST-jre PLIST-main 

Log message:
- No longer connected to build since four months. okay sthen@

Re: clang/amd64 fallout

2017-08-28 Thread Rafael Sadowski 
On Fri Jul 28, 2017 at 07:09:57PM -, Christian Weisgerber wrote:
> Here's the corresponding list of bulk build failures on amd64.
> I've uploaded the logs to
> http://build-failures.rhaalovely.net/amd64/2017-07-27/
> 
> audio/festival/core
> devel/arm-none-eabi/gcc-linaro
> devel/glog
> devel/mico
> devel/mono-addins
> devel/p5-Alien-wxWidgets
> devel/stp
> devel/ti-msp430gcc
> devel/xulrunner/24
> editors/TeXmacs
> emulators/emulationstation

Should be fixed with following diff on amd64 and i386:
https://marc.info/?l=openbsd-ports=150326477516663=2

ffmpeg hang on 6.1-stable and -current with certain video files

2017-08-28 Thread Frank Groeneveld 
When I try to convert certain video files using ffmpeg from ports on
6.1-stable or -current it randomly hangs about one in three or four
tries. I've uploaded a sample movie at:
https://ivaldi.nl/wp-content/uploads/sample.mp4

The following command reproduces the problem:
ffmpeg -i sample.mp4 -acodec aac -strict experimental -vf
scale=1280:720,setdar=2:1 -y output.mp4

This is the output when it hangs: https://pastebin.com/mb0X3hU3
The process uses 100% cpu and doesn't seem to do anything else, the
output file doesn't grow either.

One of my colleagues uses a Mac with ffmpeg 3.3.3 installed using
Homebrew and he doesn't have this problem. I modified the OpenBSD port
to build 3.3.3 and removed all local patches (had to disable some stuff
that is not useful for me anyway). After compiling this hacked port I
can convert the video with this new version without any problems.

I'm not sure whether removing the local patches has fixed this or
something in the newer ffmpeg release, but would it be possible to
update the OpenBSD port? I could probably  create a patch for it, but I
can't get some of the local patches to apply. Were they integrated by
upstream?

Thanks!
Frank

CVS: cvs.openbsd.org: ports

2017-08-28 Thread Landry Breuil 
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2017/08/28 06:25:16

Modified files:
geo/qgis   : Makefile distinfo 
geo/qgis/pkg   : PLIST 

Log message:
Update to QGIS 2.18.12.

Re: [update] yle-dl-2.23

2017-08-28 Thread Stuart Henderson 
On 2017/08/28 08:20, Timo Myyrä wrote:
> Hi,
> 
> Here's an a bit due update to yle-dl. The source structure has changed a bit.

Tweaked diff; use ports GH_* infrastructure and MODPY_EGG_VERSION,
enable tests, update license marker according to setup.py's License:
line.

But before it can be committed, we need a port of py-progress.

> The patches directory is not needed anymore but that change isn't reflected on
> the diff. Any ideas how to include that?

CVS doesn't allow removing directories. The closest you get is -P on
update/checkout.

Index: Makefile
===
RCS file: /cvs/ports/multimedia/yle-dl/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile23 Mar 2017 01:35:37 -  1.12
+++ Makefile28 Aug 2017 12:10:37 -
@@ -1,9 +1,12 @@
 # $OpenBSD: Makefile,v 1.12 2017/03/23 01:35:37 jca Exp $
 
-V =2.15
+GH_ACCOUNT =   aajanki
+GH_PROJECT =   yle-dl
+GH_TAGNAME =   2.23
+MODPY_EGG_VERSION =${GH_TAGNAME}
+
 COMMENT =  download videos from YLE Areena
-DISTNAME = aajanki-yle-$V
-PKGNAME =  yle-dl-$V
+
 CATEGORIES =   multimedia
 
 HOMEPAGE = http://aajanki.github.io/yle-dl/
@@ -12,32 +15,21 @@ MAINTAINER =Timo Myyra

Re: UPDATE: php revamp

2017-08-28 Thread Stuart Henderson 
On 2017/08/27 19:37, Martijn van Duren wrote:
> On 08/27/17 19:31, Robert Nagy wrote:
> > Yeah let's keep php as is for 6.2, you can remove 5.5 and add 7.1 but 
> > that's it.
> > After unlock we can unleash hell on the tree.
> 
> Then I'd like to propose to just remove 5.5.
> 
> Adding 7.1 would either backporting extra fixes from my patch, or keep it 
> close
> to the way 7.0 is right now (including some ugly hacks in Makefile.inc), which
> would further complicate things for me later on.
> 
> OK?

OK as far as it goes, but it needs quirks parts too.


> martijn@
> > 
> > On (2017-08-27 13:50), Stuart Henderson wrote:
> >> I would be ok with killing 5.5 and adding 7.1 but think it's the wrong time
> >> in the release cycle for anything more complex.
> >> -- 
> >>  Sent from a phone, apologies for poor formatting.
> >>
> >>
> >>
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/php/Makefile,v
> retrieving revision 1.11
> diff -u -p -r1.11 Makefile
> --- Makefile  28 Apr 2016 18:19:23 -  1.11
> +++ Makefile  27 Aug 2017 17:36:28 -
> @@ -1,7 +1,6 @@
>  # $OpenBSD: Makefile,v 1.11 2016/04/28 18:19:23 sthen Exp $
>  
>  SUBDIR =
> -SUBDIR += 5.5
>  SUBDIR += 5.6
>  SUBDIR += 7.0
>  
> Index: Makefile.inc
> ===
> RCS file: /cvs/ports/lang/php/Makefile.inc,v
> retrieving revision 1.96
> diff -u -p -r1.96 Makefile.inc
> --- Makefile.inc  24 Aug 2017 10:03:25 -  1.96
> +++ Makefile.inc  27 Aug 2017 17:36:28 -
> @@ -78,11 +78,7 @@ CONFIGURE_ARGS+=   --enable-shared \
>   --enable-sqlite-utf8 \
>   --with-sqlite3 \
>   --program-suffix=-${PV}
> -
> -# readline is broken in PHP-5.3
> -.if ${PV} != 5.3
>  CONFIGURE_ARGS +=--with-readline
> -.endif
>  
>  # apache module
>  CONFIGURE_ARGS+= --with-apxs2=${LOCALBASE}/sbin/apxs2
> @@ -221,10 +217,8 @@ MULTI_PACKAGES+= -odbc
>  COMMENT-odbc=odbc database access extensions for php5
>  CONFIGURE_ARGS+=--with-iodbc=shared,${LOCALBASE}
>  LIB_DEPENDS-odbc=databases/iodbc
> -WANTLIB-odbc=iodbc>=2 pthread
> -.if ${PV} != "5.3"
> -WANTLIB-odbc+=   iodbcinst
> -.endif
> +WANTLIB-odbc=iodbc>=2 pthread \
> + iodbcinst
>  
>  # pcntl
>  MULTI_PACKAGES+= -pcntl
> @@ -347,7 +341,6 @@ PHPXS_SUBST+= -e 's,${i},${${i}},'
>  WANTLIB-main+=   c crypto iconv intl lzma m pthread ssl xml2>=8 z
>  WANTLIB-main+=   ncurses readline ${COMPILER_LIBCXX}
>  
> -# php 5.4/5.5 : WANTLIB-main += ${COMPILER_LIBCXX}
>  WANTLIB-fastcgi= ${WANTLIB-main}
>  LIB_DEPENDS-main=devel/gettext \
>   textproc/libxml
> @@ -384,11 +377,7 @@ pre-configure:
>  MODULE_NAME-${i}=${i}
>  DESCR-${i}=  ${.CURDIR}/../files/DESCR-${i}
>  PKGNAME-${i}=php-${i}-${V}
> -.if ${V:M5.4*}
> -PKGSPEC-${i}=php-${i}->=5.4,<5.5
> -.elif ${V:M5.5*}
> -PKGSPEC-${i}=php-${i}->=5.5,<5.6
> -.elif ${V:M5.6*}
> +.if ${V:M5.6*}
>  PKGSPEC-${i}=php-${i}->=5.6,<5.7
>  .elif ${V:M7.0*}
>  PKGSPEC-${i}=php-${i}->=7.0,<7.1

i386 build failures

2017-08-28 Thread Stuart Henderson 
https://junkpile.org/p/failures/i386-20170828/devel/ti-msp430gcc.log
/usr/include/c++/v1/exception:267:5: error: no member named 'fancy_abort' in 
namespace 'std::__1'; did you mean simply 'fancy_abort'?

https://junkpile.org/p/failures/i386-20170828/editors/xemacs21/stable.log
"normal" intermittent hang, not clang

https://junkpile.org/p/failures/i386-20170828/editors/TeXmacs.log
undefined references

https://junkpile.org/p/failures/i386-20170828/emulators/emulationstation.log
/usr/include/c++/v1/utility:308:15: error: no matching constructor for 
initialization of 'std::__1::unique_ptr<ImageComponent, 
std::__1::default_delete >'

https://junkpile.org/p/failures/i386-20170828/lang/jamvm.log
clang ICE

https://junkpile.org/p/failures/i386-20170828/lang/STk.log
invalid use of a cast in a inline asm context requiring an l-value: remove the 
cast or build with -fheinous-gnu-extensions

https://junkpile.org/p/failures/i386-20170828/lang/oo2c.log
./lib/obj/ADT/ArrayList.c:518:3: error: illegal storage class on function

https://junkpile.org/p/failures/i386-20170828/lang/smlnj.log
undefined references

https://junkpile.org/p/failures/i386-20170828/multimedia/avidemux.log
i386/fft_sse.c:172:43: error: unknown token in expression
"movaps  %1, %%xmm3 \n\t"   // xmm3 = X  i1 X  i0: in1

https://junkpile.org/p/failures/i386-20170828/multimedia/transcode,lzo,mjpegtools.log
/usr/obj/ports/transcode-1.1.7-lzo-mjpegtools/transcode-1.1.7/filter/yuvdenoise/motion.c:353:4:
 error: no matching '.endr' in definition
  " pxor %%mm0 , %%mm0;  /* clear mm0   
   */"
  ^
:1:466: note: instantiated into assembly here

https://junkpile.org/p/failures/i386-20170828/sysutils/grub.log
checking for C compiler default output file name... configure: error: C 
compiler cannot create executables

https://junkpile.org/p/failures/i386-20170828/www/mongrel2.log
sh ./tests/runtests.sh
Running unit tests:
Segmentation fault (core dumped)
ERROR in test tests/cli_tests:

(plus the ones which have already been marked BROKEN).

CVS: cvs.openbsd.org: ports

2017-08-28 Thread Stuart Henderson 
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/08/28 05:47:03

Modified files:
net/librenms   : Makefile distinfo 
net/librenms/patches: patch-daily_sh patch-html_install_php 
  patch-includes_common_php 
  patch-includes_defaults_inc_php 
  patch-includes_functions_php 
  patch-validate_php 
net/librenms/pkg: PLIST 

Log message:
update to librenms-1.31

CVS: cvs.openbsd.org: ports

2017-08-28 Thread Stuart Henderson 
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/08/28 05:45:57

Modified files:
www: Makefile 
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 
Removed files:
www/zendframework: Makefile distinfo 
www/zendframework/patches: 
   
patch-library_Zend_Db_Adapter_Pdo_Abstract_php 
   patch-library_Zend_Db_Adapter_Pdo_Mssql_php 
www/zendframework/pkg: DESCR PLIST README UNMESSAGE 

Log message:
Remove www/zendframework, the port is outdated and no longer used by other
ports (icinga-web2 and piwik use zendframework, but they have their own
embedded copies), it's easy enough to install a current version using
composer if needed.

Requested by Tom Van Looy, ok martijn@, "zend it to the Attic" jasper@

CVS: cvs.openbsd.org: ports

2017-08-28 Thread Landry Breuil 
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2017/08/28 04:03:19

Modified files:
geo/pgrouting  : Makefile distinfo 
geo/pgrouting/pkg: PLIST 

Log message:
Update to pgrouting 2.4.2.

Re: youtube-dl: missing PLIST update

2017-08-28 Thread Sebastien Marie 
On Mon, Aug 28, 2017 at 08:59:47AM +0200, 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.
> 

It seems it was already done: my tree wasn't update enough :)

Thanks.
-- 
Sebastien Marie

Re: Make vim ruby FLAVOR use default ruby version

2017-08-28 Thread Stuart Henderson 
On 2017/08/27 17:02, Jeremy Evans wrote:
> This makes vim use the default ruby version instead of ruby 1.8.
> 
> Briefly tested on amd64 using examples on
> http://vimdoc.sourceforge.net/htmldoc/if_ruby.html

Makes sense, ok with me.

> All of the following still build:
> 
>  SUBDIR += vim,gtk2,perl,python,ruby
>  SUBDIR += vim,gtk2,perl,python3,ruby
>  SUBDIR += vim,no_x11,perl,python,ruby
>  SUBDIR += vim,no_x11,perl,python3,ruby
> 
> This also changes autoconf to run during pre-configure instead of
> post-patch, since I think that is the current recommended place as
> it allows you to run make patch, modify configure.ac, and then
> run make configure.

I normally use post-patch because that's where CONFIGURE_STHLE=autoconf
runs it.

CVS: cvs.openbsd.org: ports

2017-08-28 Thread Landry Breuil 
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2017/08/28 03:05:52

Modified files:
geo/mapproxy   : Makefile distinfo 

Log message:
Update to mapproxy 1.10.4.

- Fix Cross Site Scripting (XSS) issue in demo service
(https://github.com/mapproxy/mapproxy/issues/322).

CVS: cvs.openbsd.org: ports

2017-08-28 Thread Landry Breuil 
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2017/08/28 03:02:48

Modified files:
www/mozilla-firefox: Tag: OPENBSD_6_1 Makefile distinfo 
www/mozilla-firefox/pkg: Tag: OPENBSD_6_1 PLIST 

Log message:
MFC: bugfix update to firefox 55.0.3.

While here add mozsqlite3 to SHARED_LIBS and update PLIST to unbreak
runtime which was broken since 55.0 update - sorry for the inconvenience.

"Stable" packages for i386 and amd64 available at
https://packages.rhaalovely.net/
signed with https://packages.rhaalovely.net/landry-mozilla-pkg.pub

CVS: cvs.openbsd.org: ports

2017-08-28 Thread Landry Breuil 
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2017/08/28 03:00:19

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

Log message:
Bugfix update to firefox 55.0.3.

See https://www.mozilla.org/en-US/firefox/55.0.3/releasenotes/ and
https://www.mozilla.org/en-US/firefox/55.0.2/releasenotes/

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-28 Thread Antoine Jacoutot 
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/08/28 02:31:12

Modified files:
net/h323plus   : Makefile distinfo 
net/h323plus/patches: patch-configure 
net/h323plus/pkg: PLIST 

Log message:
Update to h323plus-1.26.8.20170428.

CVS: cvs.openbsd.org: ports

2017-08-28 Thread Antoine Jacoutot 
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/08/28 02:31:29

Modified files:
net/gnugk  : Makefile distinfo 
net/gnugk/patches: patch-Toolkit_cxx patch-configure 
   patch-gk_cxx patch-yasocket_cxx 
net/gnugk/pkg  : PLIST gnugk.rc 

Log message:
Update to gnugk-4.5.

Re: Remove www/puppet-dashboard?

2017-08-28 Thread Jasper Lievisse Adriaanse 
On Mon, Aug 28, 2017 at 07:46:37AM +0200, Antoine Jacoutot wrote:
> On Sun, Aug 27, 2017 at 06:11:22PM -0700, Jeremy Evans wrote:
> > puppet-dashboard is one of the only remaining ports still depending on
> > ruby 1.8.
> > 
> > Embeds Rails 2.3.17, released in Feburary 2013, and many other ruby
> > libraries of similar vintage.  I'm not sure it's actually vulnerable to
> > any of the many Rails vulnerabilities announced since, but it wouldn't
> > surprise me.
> > 
> > Port doesn't actually build anything, it basically just untars and
> > retars the distfile, other than fixing shebang lines and changing
> > some hardcoded paths.  I think removing it using the following quirk
> > makes sense:
> 
> It does provide a detailed pkg-readme.
> But yeah, the last release is from 2014 and this application has been 
> deprecated
> for years anyway.
> 
> > "web application with no benefit being packaged"
> > 
> > OKs to remove?
> 
> OK with me.
> 
> -- 
> Antoine

I'm OK with removing it, however I'd paint the bikeshed with 'no longer
maintained upstream'.

Cheers,
-- 
jasper

CVS: cvs.openbsd.org: ports

2017-08-28 Thread David Coppa 
CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2017/08/28 01:28:23

Modified files:
databases/ruby-redis: Makefile distinfo 
databases/ruby-redis/patches: 
  patch-test_publish_subscribe_test_rb 
databases/ruby-redis/pkg: PLIST 
databases/ruby-redis-namespace: Makefile 
databases/ruby-resque: Makefile 
Added files:
databases/ruby-redis/patches: patch-Rakefile 
Removed files:
databases/ruby-redis/patches: patch-makefile 

Log message:
Revert, broken at runtime.
Fix dependencies while here.

youtube-dl: missing PLIST update

2017-08-28 Thread Sebastien Marie 
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.
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/www/youtube-dl/Makefile,v
retrieving revision 1.170
diff -u -p -r1.170 Makefile
--- Makefile24 Aug 2017 14:29:03 -  1.170
+++ Makefile28 Aug 2017 06:55:20 -
@@ -4,6 +4,7 @@ COMMENT =   CLI program to download videos
 
 VERSION =  2017.08.23
 MODPY_EGG_VERSION =${VERSION:S/.0/./g}
+REVISION = 0
 
 DISTNAME = youtube-dl-${VERSION}
 CATEGORIES =   www
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/youtube-dl/pkg/PLIST,v
retrieving revision 1.111
diff -u -p -r1.111 PLIST
--- pkg/PLIST   11 Aug 2017 15:50:15 -  1.111
+++ pkg/PLIST   28 Aug 2017 06:55:21 -
@@ -231,6 +231,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/cjsw.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/cliphunter.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/cliphunter.pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/clippit.py
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/clippit.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/cliprs.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/cliprs.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/clipsyndicate.py
@@ -979,6 +981,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/rds.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/redbulltv.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/redbulltv.pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/reddit.py
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/reddit.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/redtube.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/redtube.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/regiotv.py

CVS: cvs.openbsd.org: ports

2017-08-28 Thread David Coppa 
CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2017/08/28 00:23:31

Modified files:
databases/ruby-resque: Makefile 

Log message:
bump

[update] yle-dl-2.23

2017-08-28 Thread Timo Myyrä 
Hi,

Here's an a bit due update to yle-dl. The source structure has changed a bit.
The patches directory is not needed anymore but that change isn't reflected on
the diff. Any ideas how to include that?

Timo

Index: Makefile
===
RCS file: /cvs/ports/multimedia/yle-dl/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile23 Mar 2017 01:35:37 -  1.12
+++ Makefile28 Aug 2017 05:09:14 -
@@ -1,6 +1,6 @@
 # $OpenBSD: Makefile,v 1.12 2017/03/23 01:35:37 jca Exp $
 
-V =2.15
+V =2.23
 COMMENT =  download videos from YLE Areena
 DISTNAME = aajanki-yle-$V
 PKGNAME =  yle-dl-$V
@@ -18,26 +18,20 @@ MODULES =   lang/python \
lang/php
 
 RUN_DEPENDS =  net/rtmpdump \
+   devel/py-progress \
+   www/py-requests \
security/py-crypto \
lang/php/${MODPHP_VERSION},-curl \
lang/php/${MODPHP_VERSION},-mcrypt
-
+   
 NO_TEST =  Yes
 
-WRKDIST =  ${WRKDIR}/aajanki-yle-dl-e188267
+WRKDIST =  ${WRKDIR}/aajanki-yle-dl-69ad5e9
 
 MODPY_SETUPTOOLS = Yes
-MODPY_ADJ_FILES =  yle-dl
 MODPHP_BUILDDEP =  No
 
-SUBST_VARS +=  MODPHP_BIN
-
-do-install:
-   ${SUBST_PROGRAM} ${WRKSRC}/yle-dl ${PREFIX}/bin/yle-dl
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/yle-dl
-   ${INSTALL_DATA} ${WRKSRC}/AdobeHDS.php ${PREFIX}/share/yle-dl
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/yle-dl
-   ${INSTALL_DATA} ${WRKSRC}/COPYING ${WRKSRC}/README.fi \
-   ${WRKSRC}/README.md ${PREFIX}/share/doc/yle-dl
+pre-configure:
+   @sed -i -e "s,'php','${MODPHP_BIN}',g" ${WRKSRC}/yledl/downloaders.py
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/multimedia/yle-dl/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo19 Mar 2017 20:28:07 -  1.8
+++ distinfo28 Aug 2017 05:09:14 -
@@ -1,2 +1,2 @@
-SHA256 (aajanki-yle-2.15.tar.gz) = FHEXm1OG2njar5LkJTQ+rHPKVLXRgfitjToLrHfCurs=
-SIZE (aajanki-yle-2.15.tar.gz) = 58040
+SHA256 (aajanki-yle-2.23.tar.gz) = 10qK2Ggj1KB1PIp02qtAiBBv4ePt0vNttrzuPNnApbs=
+SIZE (aajanki-yle-2.23.tar.gz) = 62376
Index: patches/patch-yle-dl
===
RCS file: patches/patch-yle-dl
diff -N patches/patch-yle-dl
--- patches/patch-yle-dl19 Mar 2017 20:28:07 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-$OpenBSD: patch-yle-dl,v 1.3 2017/03/19 20:28:07 benoit Exp $
 yle-dl.origMon Mar 13 06:36:30 2017
-+++ yle-dl Mon Mar 13 06:37:05 2017
-@@ -74,7 +74,7 @@ excludechars_linux = '*/|'
- excludechars_windows = '\"*/:<>?|'
- excludechars = excludechars_linux
- rtmpdump_binary = None
--hds_binary = ['php', '/usr/local/share/yle-dl/AdobeHDS.php']
-+hds_binary = ['${MODPHP_BIN}', '/usr/local/share/yle-dl/AdobeHDS.php']
- stream_proxy = None
- 
- libcname = ctypes.util.find_library('c')
-@@ -132,7 +132,7 @@ def usage():
- log('--rtmpdump path Set path to rtmpdump binary')
- log('--adobehds cmd  Set command for executing AdobeHDS.php '
- 'script')
--log('Default: "php '
-+log('Default: "${MODPHP_BIN} '
- '/usr/local/share/yle-dl/AdobeHDS.php"')
- log('--postprocess cmd   Execute a command cmd after a successful '
- 'download.')
Index: pkg/PLIST
===
RCS file: /cvs/ports/multimedia/yle-dl/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   1 Sep 2016 13:33:05 -   1.3
+++ pkg/PLIST   28 Aug 2017 05:09:14 -
@@ -1,8 +1,21 @@
 @comment $OpenBSD: PLIST,v 1.3 2016/09/01 13:33:05 sthen Exp $
 bin/yle-dl
-share/doc/yle-dl/
-share/doc/yle-dl/COPYING
-share/doc/yle-dl/README.fi
-share/doc/yle-dl/README.md
-share/yle-dl/
-share/yle-dl/AdobeHDS.php
+lib/python${MODPY_VERSION}/site-packages/yle_dl-${V}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/yle_dl-${V}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/yle_dl-${V}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-${V}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-${V}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-${V}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-${V}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/yledl/