[maintainer update] yle-dl-20181221

2018-12-29 Thread Timo Myyrä
Hi,

Here's update to latest version of yle-dl. This requires the py-attrs update
I've already sent. Also drops patch in favor of using sed to modify setup.py.

Timo

Index: Makefile
===
RCS file: /cvs/ports/multimedia/yle-dl/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile17 Oct 2018 14:15:55 -  1.19
+++ Makefile30 Dec 2018 07:08:30 -
@@ -2,9 +2,8 @@
 
 GH_ACCOUNT =   aajanki
 GH_PROJECT =   yle-dl
-GH_TAGNAME =   2.34
+GH_TAGNAME =   20181221
 MODPY_EGG_VERSION =${GH_TAGNAME}
-REVISION = 0
 
 COMMENT =  download videos from YLE Areena
 
@@ -22,6 +21,7 @@ MODULES = lang/python \
 TEST_DEPENDS = ${RUN_DEPENDS}
 
 RUN_DEPENDS =  devel/py-attrs \
+   devel/py-configargparse \
devel/py-future \
devel/py-progress \
net/rtmpdump \
@@ -38,5 +38,6 @@ MODPHP_BUILDDEP = No
 
 pre-configure:
@sed -i -e "s,'php','${MODPHP_BIN}',g" ${WRKSRC}/yledl/io.py
+   @sed -i -e "s,'pycryptodomex','pycryptodome',g" ${WRKSRC}/setup.py  
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/multimedia/yle-dl/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo9 Aug 2018 19:57:55 -   1.11
+++ distinfo30 Dec 2018 07:08:30 -
@@ -1,2 +1,2 @@
-SHA256 (yle-dl-2.34.tar.gz) = ngNLq0ED+/c+3ppJQGpuoedmKgOj5VxdK7Wf2XwzNO0=
-SIZE (yle-dl-2.34.tar.gz) = 76310
+SHA256 (yle-dl-20181221.tar.gz) = b54oE8OvMGHLu3AU6bvb3TmU0HzBeydmH1+XLSIKQfw=
+SIZE (yle-dl-20181221.tar.gz) = 82624
Index: patches/patch-setup_py
===
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- patches/patch-setup_py  9 Aug 2018 19:57:55 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,18 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1 2018/08/09 19:57:55 sthen Exp $
-
-Ports uses cryptodome (with Crypto prefix) rather than cryptodomex
-(with Cryptodome prefix). This is referenced in yledl/extractors.py which
-tries with both prefixes.
-
-Index: setup.py
 setup.py.orig
-+++ setup.py
-@@ -38,7 +38,7 @@ setup(
- packages=['yledl'],
- include_package_data=True,
- install_requires=[
--'pycryptodomex', 'requests', 'lxml', 'future', 'PySocks', 'mini-amf',
-+'pycryptodome', 'requests', 'lxml', 'future', 'PySocks', 'mini-amf',
- 'attrs >= 17.4.0'
- ] + ssl_sni_requires,
- extras_require = {
Index: pkg/PLIST
===
RCS file: /cvs/ports/multimedia/yle-dl/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST   9 Aug 2018 19:57:55 -   1.6
+++ pkg/PLIST   30 Dec 2018 07:08:30 -
@@ -25,10 +25,20 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/yledl/http.pyc
 lib/python${MODPY_VERSION}/site-packages/yledl/io.py
 lib/python${MODPY_VERSION}/site-packages/yledl/io.pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/kaltura.py
+lib/python${MODPY_VERSION}/site-packages/yledl/kaltura.pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/localization.py
+lib/python${MODPY_VERSION}/site-packages/yledl/localization.pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/rtmp.py
+lib/python${MODPY_VERSION}/site-packages/yledl/rtmp.pyc
 lib/python${MODPY_VERSION}/site-packages/yledl/streamfilters.py
 lib/python${MODPY_VERSION}/site-packages/yledl/streamfilters.pyc
-lib/python${MODPY_VERSION}/site-packages/yledl/streams.py
-lib/python${MODPY_VERSION}/site-packages/yledl/streams.pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/streamflavor.py
+lib/python${MODPY_VERSION}/site-packages/yledl/streamflavor.pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/timestamp.py
+lib/python${MODPY_VERSION}/site-packages/yledl/timestamp.pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/titleformatter.py
+lib/python${MODPY_VERSION}/site-packages/yledl/titleformatter.pyc
 lib/python${MODPY_VERSION}/site-packages/yledl/utils.py
 lib/python${MODPY_VERSION}/site-packages/yledl/utils.pyc
 lib/python${MODPY_VERSION}/site-packages/yledl/version.py



[update] py-attrs-18.2.0

2018-12-29 Thread Timo Myyrä
Hi,

Here is a diff to bump devel/py-attrs version. This is required for yle-dl
update.

Timo

Index: Makefile
===
RCS file: /cvs/ports/devel/py-attrs/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Makefile28 Apr 2018 10:41:38 -  1.2
+++ Makefile30 Dec 2018 07:05:21 -
@@ -2,7 +2,7 @@
 
 COMMENT =  classes without boilerplate
 
-MODPY_EGG_VERSION =17.4.0
+MODPY_EGG_VERSION =18.2.0
 
 DISTNAME = attrs-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
Index: distinfo
===
RCS file: /cvs/ports/devel/py-attrs/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo28 Apr 2018 10:41:38 -  1.2
+++ distinfo30 Dec 2018 07:05:21 -
@@ -1,2 +1,2 @@
-SHA256 (attrs-17.4.0.tar.gz) = HHlgzP1qAFzZ97qITmMWteQwo/Gmw3xfh9i0P4O1Tsk=
-SIZE (attrs-17.4.0.tar.gz) = 97071
+SHA256 (attrs-18.2.0.tar.gz) = EMv24n286MMIB8rwVsjrUJF+Dqr+hjR2cbVyVABsPmk=
+SIZE (attrs-18.2.0.tar.gz) = 116817
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-attrs/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST   28 Apr 2018 10:41:38 -  1.2
+++ pkg/PLIST   30 Dec 2018 07:05:21 -
@@ -3,22 +3,28 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/attr/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_config.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_funcs.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_make.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}converters.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}validators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/attr/__init__.pyi
 lib/python${MODPY_VERSION}/site-packages/attr/_compat.py
+lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/attr/_config.py
+lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_config.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/attr/_funcs.py
+lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_funcs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/attr/_make.py
+lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_make.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/attr/converters.py
+lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}converters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/attr/converters.pyi
 lib/python${MODPY_VERSION}/site-packages/attr/exceptions.py
+lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/attr/exceptions.pyi
 lib/python${MODPY_VERSION}/site-packages/attr/filters.py
+lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/attr/filters.pyi
+lib/python${MODPY_VERSION}/site-packages/attr/py.typed
 lib/python${MODPY_VERSION}/site-packages/attr/validators.py
+lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}validators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/attr/validators.pyi
 
lib/python${MODPY_VERSION}/site-packages/attrs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/attrs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 
lib/python${MODPY_VERSION}/site-packages/attrs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt



Re: NEW: games/bstone

2018-12-29 Thread Jonathan Gray
On Fri, Dec 28, 2018 at 11:17:33AM -0500, Brian Callahan wrote:
> 
> 
> On 12/26/18 6:52 PM, Brian Callahan wrote:
> > 
> > 
> > On 12/26/18 6:43 PM, Jonathan Gray wrote:
> > > On Wed, Dec 26, 2018 at 06:06:14PM -0500, Brian Callahan wrote:
> > > > 
> > > > On 12/26/18 6:00 PM, Jonathan Gray wrote:
> > > > > On Wed, Dec 26, 2018 at 09:24:18AM -0500, Brian Callahan wrote:
> > > > > > On 12/25/18 6:26 PM, Jonathan Gray wrote:
> > > > > > > On Tue, Dec 25, 2018 at 10:35:02AM -0500, Brian Callahan wrote:
> > > > > > > > Hi ports --
> > > > > > > > 
> > > > > > > > Attached is a new port, games/bstone. BStone is
> > > > > > > > a source port of Blake Stone
> > > > > > > > FPS game series engine.
> > > > > > > > 
> > > > > > > > ---
> > > > > > > > pkg/DESCR:
> > > > > > > > BStone is a source port of the Blake Stone game
> > > > > > > > series games Aliens of
> > > > > > > > Gold and Planet Strike.
> > > > > > > > 
> > > > > > > > Features:
> > > > > > > > * High resolution rendering of the world (extended vanilla 
> > > > > > > > engine)
> > > > > > > > * Modern and vanilla controls
> > > > > > > > * Customizable control bindings
> > > > > > > > * Separate volume control for sound effects and music
> > > > > > > > 
> > > > > > > > Note that while this package is open source, the
> > > > > > > > games are not. You must
> > > > > > > > purchase at least one of the games in order to use this package.
> > > > > > > Aliens of Gold shareware worked when I tried a while ago.
> > > > > > You're right. Minor wording tweaks to note that.
> > > > > > 
> > > > > > ~Brian
> > > > > Doesn't build on amd64 here
> > > > > 
> > > > > ===>?? Checking files for bstone-1.1.9.1
> > > > > `/usr/ports/distfiles/bstone-1.1.9.1-48c286fb.tar.gz' is up to date.
> > > > > > > (SHA256) bstone-1.1.9.1-48c286fb.tar.gz: OK
> > > > > ===> bstone-1.1.9.1 depends on: cmake-* -> cmake-3.10.2p1v0
> > > > > ===> bstone-1.1.9.1 depends on: ninja->=1.5.1 -> ninja-1.8.2p0
> > > > > ===> bstone-1.1.9.1 depends on: sdl2-* -> sdl2-2.0.8p1
> > > > > ===>?? Verifying specs:?? c++ c++abi pthread SDL2 c m
> > > > > ===>?? found c++.2.0 c++abi.0.1 pthread.25.1 SDL2.0.5 c.93.0 m.10.1
> > > > > ===>?? Extracting for bstone-1.1.9.1
> > > > > ===>?? Patching for bstone-1.1.9.1
> > > > > ===> Applying OpenBSD patch patch-src_CMakeLists_txt
> > > > > Hmm...?? Looks like a unified diff to me...
> > > > > The text leading up to this was:
> > > > > --
> > > > > |$OpenBSD$
> > > > > |
> > > > > |Install binary to the correct location.
> > > > > |We don't need to install these text files.
> > > > > |
> > > > > |Index: src/CMakeLists.txt
> > > > > |--- src/CMakeLists.txt.orig
> > > > > |+++ src/CMakeLists.txt
> > > > > --
> > > > > Patching file src/CMakeLists.txt using Plan A...
> > > > > Hunk #1 succeeded at 358.
> > > > > done
> > > > > ===> Applying OpenBSD patch patch-src_jm_free_cpp
> > > > > Hmm...?? Looks like a unified diff to me...
> > > > > The text leading up to this was:
> > > > > --
> > > > > |$OpenBSD$
> > > > > |
> > > > > |Prevent segfault during intro movies.
> > > > > |
> > > > > |Index: src/jm_free.cpp
> > > > > |--- src/jm_free.cpp.orig
> > > > > |+++ src/jm_free.cpp
> > > > > --
> > > > > Patching file src/jm_free.cpp using Plan A...
> > > > > Hunk #1 succeeded at 948.
> > > > > done
> > > > > ===> Applying OpenBSD patch patch-src_jm_tp_cpp
> > > > > Hmm...?? Looks like a unified diff to me...
> > > > > The text leading up to this was:
> > > > > --
> > > > > |$OpenBSD$
> > > > > |
> > > > > |Prevent segfault on level load.
> > > > > |
> > > > > |Index: src/jm_tp.cpp
> > > > > |--- src/jm_tp.cpp.orig
> > > > > |+++ src/jm_tp.cpp
> > > > > --
> > > > > Patching file src/jm_tp.cpp using Plan A...
> > > > > Hunk #1 succeeded at 3360.
> > > > > done
> > > > > ===>?? Compiler link: clang -> /usr/bin/clang
> > > > > ===>?? Compiler link: clang++ -> /usr/bin/clang++
> > > > > ===>?? Compiler link: cc -> /usr/bin/cc
> > > > > ===>?? Compiler link: c++ -> /usr/bin/c++
> > > > > ===>?? Generating configure for bstone-1.1.9.1
> > > > > ===>?? Configuring for bstone-1.1.9.1
> > > > > -- The CXX compiler identification is Clang 6.0.0
> > > > > -- Check for working CXX compiler:
> > > > > /usr/ports/pobj/bstone-1.1.9.1/bin/c++
> > > > > -- Check for working CXX compiler:
> > > > > /usr/ports/pobj/bstone-1.1.9.1/bin/c++ -- works
> > > > > -- Detecting CXX compiler ABI info
> > > > > -- Detecting CXX compiler ABI info - done
> > > > > -- Detecting CXX compile features
> > > > > -- Detecting CXX compile features - done
> > > > > -- Looking for C++ include pthread.h
> > > > > -- Looking for C++ include pthread.h - found
> > > > > -- Looking for pthread_create
> > > > > -- Looking for pthread_create - found
> > > > > -- Found Threads: TRUE
> > > > > -- Found SDL:
> > > > > /usr/local/lib/libSDL2main.a;/usr/local/li

Re: fix devel/tbb on aarch64

2018-12-29 Thread Jonathan Gray
On Sat, Dec 29, 2018 at 07:18:22PM +0100, Pascal Stumpf wrote:
> This is enough to get tbb to build and test successfully on aarch64.
> 
> 
> Index: patches/patch-build_OpenBSD_inc
> ===
> RCS file: patches/patch-build_OpenBSD_inc
> diff -N patches/patch-build_OpenBSD_inc
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-build_OpenBSD_inc   29 Dec 2018 18:18:06 -
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +
> +Index: build/OpenBSD.inc
> +--- build/OpenBSD.inc.orig
>  build/OpenBSD.inc
> +@@ -24,6 +24,9 @@ ifndef arch
> + ifeq ($(shell uname -m),amd64)
> + export arch:=intel64
> + endif
> ++ifeq ($(shell uname -m),arm64)
> ++export arch:=aarch64
> ++endif
> + endif
> + 
> + ifndef runtime
> 

It isn't clear where 'arch' is used but compared to the linux .inc there
are cases missing including the fallback.  You have used tabs in a block
that only had spaces.

--- /dev/null   Sun Dec 30 12:57:28 2018
+++ patches/patch-build_OpenBSD_inc Sun Dec 30 12:56:03 2018
@@ -0,0 +1,29 @@
+$OpenBSD$
+
+Index: build/OpenBSD.inc
+--- build/OpenBSD.inc.orig
 build/OpenBSD.inc
+@@ -18,11 +18,21 @@
+ #
+ 
+ ifndef arch
+-ifeq ($(shell uname -m),i386)
++uname_p:=$(shell uname -p)
++ifeq ($(uname_p),i386)
+ export arch:=ia32
+ endif
+-ifeq ($(shell uname -m),amd64)
++ifeq ($(uname_p),amd64)
+ export arch:=intel64
++endif
++ifeq ($(uname_p),sparc64)
++export arch:=sparc
++endif
++ifeq ($(uname_p),arm)
++export arch:=armv7
++endif
++ifndef arch
++export arch:=$(uname_p)
+ endif
+ endif
+ 



Re: Work-around for not-shown JPEG images in www/links+

2018-12-29 Thread trondd
On Sat, December 29, 2018 5:14 pm, Ted Unangst wrote:
> Hannes Wenzel wrote:
>> I don't see whether upstream deliberately or accidentally does
>> #cmakedefine HAVE_LOCAL_H
>> instead of
>> #cmakedefine HAVE_LOCAL_H 1
>> and I, honestly, don't care. Just want to get this off my mind.
>
> fyi, the port was updated after 6.4 to fix this.
>
> http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/graphics/jpeg/Makefile
>

Yup.  Thanks.  Also the relevant ports@ thread

https://marc.info/?l=openbsd-ports&m=154212464114072&w=2



Re: NEW: cad/xschem

2018-12-29 Thread Klemens Nanni
On Sun, Dec 30, 2018 at 01:46:55AM +0100, Klemens Nanni wrote:
> Yes, see `man -Otag SUBST_VARS bsd.port.mk' and other users in the tree.
Typo, my bad.

man -O tag=SUBST_VARS bsd.port.mk



Re: NEW: cad/xschem

2018-12-29 Thread Klemens Nanni
On Sun, Dec 30, 2018 at 02:10:52AM +0200, Hannu Vuolasaho wrote:
> The xschem-2.8.1 doesn't support that. I'll write patch to upstream so next
> version will have that fixed too.
It's a make variable so you can always pass it through MAKE_ENV or
MAKE_FLAGS, but since that's relevant for the fake/install, FAKE_FLAGS
seems even more suitable.

Can you look into upstreaming the GNUism fixes, too?

> Already fixed in svn. Next release will drop all of those patches.
OK. Leaving the fprintf fix as you did is fine, I think.

> ./configure has --debug option and it will set -g -O0. I added
> .ifdef DEBUG to turn that configure variable on.
A bit static but good enough for me.

> I took my time and tried to make the Makefile more readable.
Much better, thanks.

> Added that too. I left the comment if someone wants to go with 8.6 for
> some reason or it becomes default tcl.
Not sure if that's worth it, at least stuff like the
`port-lib-depends-check' target will detect these when updating or
switching to 8.6 - I'd remove it and just inline XSCHEM_LDFLAGS.

> Fixed this with horrible sed patch. Is there a better way? I also
> added uninstall
> target for the man page but is it needed anywhere?
Yes, see `man -Otag SUBST_VARS bsd.port.mk' and other users in the tree.

> How about totally evil :) Those are Synopsys/Mentor tools.
So should we disable this behaviour? What's the impact?



Re: NEW: cad/xschem

2018-12-29 Thread Hannu Vuolasaho
la 29. jouluk. 2018 klo 16.49 Klemens Nanni (k...@openbsd.org) kirjoitti:

> * can you avoid the Makefile patch for MANDIR by passing it as configure
>   flag?

The xschem-2.8.1 doesn't support that. I'll write patch to upstream so next
version will have that fixed too.

> * the stylistic C fixes should be dropped as they're only churn and do
>   not fix actual errors - you can send them upstream

Already fixed in svn. Next release will drop all of those patches.

> * DEBUG='-g3 -O0' is not picked up, please make sure

./configure has --debug option and it will set -g -O0. I added
.ifdef DEBUG to turn that configure variable on.

I took my time and tried to make the Makefile more readable.

> * tcl8.6 is in ports and seems to have different requirements as per
>   your comments, I suggest pinning one version with MODTK_VERSION

Added that too. I left the comment if someone wants to go with 8.6 for
some reason or it becomes default tcl.

> * xschem(1) references files with "$PREFIX", this should be substituted
>   with the actually used prefix

Fixed this with horrible sed patch. Is there a better way? I also
added uninstall
target for the man page but is it needed anywhere?

> * Clicking "Waves" then "Cancel" always shows
>   "sh: /home/kn/waveview_2013/bin/wv: not found", no idea if if this is
>   good or bad
> * Selecting some of the simulations shows similar errors:
>   "sh: /home/kn/cosmoscope/amd64/ai_bin/cscope: not found"

How about totally evil :) Those are Synopsys/Mentor tools.
which don't support OpenBSD. However those can be used with some
shell and SSH trickery from other unix environment. Next release should
bring more simulation back-ends and waveform viewers.

Anyway when going through these I noticed, I need MODTCL_WISH_ADJ.

Thank you for a review. I have attached a fixed version of the port.

Best regards,
Hannu Vuolasaho


xschem.tar.gz
Description: application/gzip


Re: [Update] editors/tiled 1.2.1

2018-12-29 Thread Max Fillinger
Fixed some comments sent off-list by Rafael Sadowski.  (Thanks for
pointing me to /usr/src/lib/check_sym!)

* Major version bump for shared library libtiled.  (No change to the
  comment because the version wasn't bumped by tiled itself.)
* Homepage uses https now.
* "COMPILER = ..." is unnecessary with the QT5 module.


Index: editors/tiled/Makefile
===
RCS file: /cvs/ports/editors/tiled/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- editors/tiled/Makefile  24 Oct 2018 14:28:01 -  1.14
+++ editors/tiled/Makefile  29 Dec 2018 22:59:08 -
@@ -2,30 +2,26 @@
 
 COMMENT =  tile map editor
 
-V =0.9.1
-DISTNAME = tiled-qt-${V}
-PKGNAME =  tiled-${V}
-REVISION = 6
+V =1.2.1
+GH_ACCOUNT =   bjorn
+GH_PROJECT =   tiled
+GH_TAGNAME =   v${V}
 
-SHARED_LIBS += tiled 0.0 # 1.0
+SHARED_LIBS += tiled 1.0 # 1.0
 
 CATEGORIES =   editors games
 
-HOMEPAGE = http://www.mapeditor.org/
+HOMEPAGE = https://www.mapeditor.org/
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB += GL ICE QtGui QtOpenGL SM X11 Xext Xi Xinerama Xrender
+WANTLIB += GL ICE Qt5Gui Qt5OpenGL SM X11 Xext Xi Xinerama Xrender
 WANTLIB += c fontconfig freetype m pthread ${COMPILER_LIBCXX} z
 
-COMPILER = base-clang ports-gcc base-gcc
-
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tiled/}
-
 RUN_DEPENDS =  devel/desktop-file-utils \
x11/gtk+3,-guic
-MODULES =  devel/qmake x11/qt4
+MODULES =  devel/qmake x11/qt5
 
 # XXX qmake picks up Cocoa/Cocoa.h even though it's apparently unused
 DPB_PROPERTIES =   nojunk
Index: editors/tiled/distinfo
===
RCS file: /cvs/ports/editors/tiled/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- editors/tiled/distinfo  28 Apr 2014 09:48:54 -  1.2
+++ editors/tiled/distinfo  29 Dec 2018 22:59:08 -
@@ -1,2 +1,2 @@
-SHA256 (tiled-qt-0.9.1.tar.gz) = aGj4MzuMZoNTAXkgUaduf8aEZ2GbbpeoW1h/U3w2tSc=
-SIZE (tiled-qt-0.9.1.tar.gz) = 1436286
+SHA256 (tiled-1.2.1.tar.gz) = MpLBHC29reK/TVRyNEGIKnfhI7deel+K3D9BUI+fJug=
+SIZE (tiled-1.2.1.tar.gz) = 16773680
Index: 
editors/tiled/patches/patch-src_automappingconverter_automappingconverter_pro
===
RCS file: 
/cvs/ports/editors/tiled/patches/patch-src_automappingconverter_automappingconverter_pro,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_automappingconverter_automappingconverter_pro
--- 
editors/tiled/patches/patch-src_automappingconverter_automappingconverter_pro   
28 Apr 2014 09:48:54 -  1.1
+++ 
editors/tiled/patches/patch-src_automappingconverter_automappingconverter_pro   
29 Dec 2018 22:59:08 -
@@ -1,12 +1,11 @@
-$OpenBSD: patch-src_automappingconverter_automappingconverter_pro,v 1.1 
2014/04/28 09:48:54 bentley Exp $
 src/automappingconverter/automappingconverter.pro.orig Mon Apr 28 
02:32:11 2014
-+++ src/automappingconverter/automappingconverter.pro  Mon Apr 28 02:32:17 2014
-@@ -48,7 +48,7 @@ HEADERS  += \
+--- src/automappingconverter/automappingconverter.pro.orig Mon Nov 26 
23:01:27 2018
 src/automappingconverter/automappingconverter.pro  Mon Nov 26 23:01:56 2018
+@@ -46,7 +46,7 @@ HEADERS  += \
  FORMS+= \
  converterwindow.ui
  
 -manpage.path = $${PREFIX}/share/man/man1/
 +manpage.path = $${PREFIX}/man/man1/
- manpage.files += ../../docs/automappingconverter.1
+ manpage.files += ../../man/automappingconverter.1
  INSTALLS += manpage
  
Index: editors/tiled/patches/patch-src_tiled_tiled_pro
===
RCS file: /cvs/ports/editors/tiled/patches/patch-src_tiled_tiled_pro,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_tiled_tiled_pro
--- editors/tiled/patches/patch-src_tiled_tiled_pro 28 Apr 2014 09:48:54 
-  1.2
+++ editors/tiled/patches/patch-src_tiled_tiled_pro 29 Dec 2018 22:59:08 
-
@@ -1,12 +1,11 @@
-$OpenBSD: patch-src_tiled_tiled_pro,v 1.2 2014/04/28 09:48:54 bentley Exp $
 src/tiled/tiled.pro.orig   Sat Jul 27 14:34:23 2013
-+++ src/tiled/tiled.proMon Apr 28 01:48:23 2014
-@@ -286,7 +286,7 @@ desktopfile.path = $${PREFIX}/share/applications/
- desktopfile.files += ../../docs/tiled.desktop
- INSTALLS += desktopfile
+--- src/tiled/tiled.pro.orig   Mon Nov 26 23:15:41 2018
 src/tiled/tiled.proMon Nov 26 23:16:00 2018
+@@ -524,7 +524,7 @@ appdatafile.path = $${PREFIX}/share/metainfo/
+ appdatafile.files += ../../org.mapeditor.Tiled.appdata.xml
+ INSTALLS += appdatafile
  
 -manpage.path = $${PREFIX}/share/man/man1/
 +manpage.path = $${PREFIX}/man/man1/
- manpage.files += ../../docs/ti

fix inputmethods/uim on aarch64

2018-12-29 Thread Pascal Stumpf
Add aarch64 support to the internal copy of boehm-gc, taken from
boehm-gc upstream and the OpenBSD port.


Index: patches/patch-sigscheme_libgcroots_include_private_gcconfig_h
===
RCS file: patches/patch-sigscheme_libgcroots_include_private_gcconfig_h
diff -N patches/patch-sigscheme_libgcroots_include_private_gcconfig_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-sigscheme_libgcroots_include_private_gcconfig_h   29 Dec 
2018 22:22:31 -
@@ -0,0 +1,118 @@
+$OpenBSD$
+
+Index: sigscheme/libgcroots/include/private/gcconfig.h
+--- sigscheme/libgcroots/include/private/gcconfig.h.orig
 sigscheme/libgcroots/include/private/gcconfig.h
+@@ -62,6 +62,14 @@
+ # endif
+ 
+ /* Determine the machine type: */
++# if defined(__aarch64__)
++#define AARCH64
++#if !defined(LINUX) && !defined(DARWIN) && !defined(FREEBSD) \
++&& !defined(OPENBSD)
++#  define NOSYS
++#  define mach_type_known
++#endif
++# endif
+ # if defined(__arm__) || defined(__thumb__)
+ #define ARM32
+ #if !defined(LINUX) && !defined(NETBSD)
+@@ -75,6 +83,10 @@
+ # if defined(hp9000s300)
+ #error M68K based HP machines no longer supported.
+ # endif
++# if defined(OPENBSD) && defined(__aarch64__)
++#define AARCH64
++#define mach_type_known
++# endif
+ # if defined(OPENBSD) && defined(m68k)
+ #define M68K
+ #define mach_type_known
+@@ -1721,6 +1733,86 @@
+ #   define DATAEND (_end)
+ #   define CACHE_LINE_SIZE 256
+ #   define GETPAGESIZE() 4096
++#   endif
++# endif
++
++# ifdef AARCH64
++#   define MACH_TYPE "AARCH64"
++#   ifdef __ILP32__
++# define CPP_WORDSZ 32
++# define ALIGNMENT 4
++#   else
++# define CPP_WORDSZ 64
++# define ALIGNMENT 8
++#   endif
++#   ifndef HBLKSIZE
++# define HBLKSIZE 4096
++#   endif
++#   ifdef LINUX
++# define OS_TYPE "LINUX"
++# define LINUX_STACKBOTTOM
++# define DYNAMIC_LOADING
++  extern int __data_start[];
++  extern int _end[];
++# define DATASTART ((ptr_t)__data_start)
++# define DATAEND ((ptr_t)(&_end))
++#   endif
++#   ifdef DARWIN
++  /* iOS */
++# define OS_TYPE "DARWIN"
++# define DARWIN_DONT_PARSE_STACK
++# ifndef GC_DONT_REGISTER_MAIN_STATIC_DATA
++#   define DYNAMIC_LOADING
++# endif
++# define DATASTART ((ptr_t)get_etext())
++# define DATAEND   ((ptr_t)get_end())
++# define STACKBOTTOM ((ptr_t)0x16fdf)
++# ifndef USE_MMAP
++#   define USE_MMAP
++# endif
++# define USE_MMAP_ANON
++# define MPROTECT_VDB
++# include 
++# define GETPAGESIZE() (unsigned)getpagesize()
++  /* FIXME: There seems to be some issues with trylock hanging on   */
++  /* darwin. This should be looked into some more.  */
++# define NO_PTHREAD_TRYLOCK
++# if TARGET_OS_IPHONE && !defined(NO_DYLD_BIND_FULLY_IMAGE)
++#   define NO_DYLD_BIND_FULLY_IMAGE
++# endif
++#   endif
++#   ifdef FREEBSD
++# define OS_TYPE "FREEBSD"
++# ifndef GC_FREEBSD_THREADS
++#   define MPROTECT_VDB
++# endif
++# define FREEBSD_STACKBOTTOM
++# ifdef __ELF__
++#   define DYNAMIC_LOADING
++# endif
++  extern char etext[];
++# define DATASTART GC_FreeBSDGetDataStart(0x1000, (ptr_t)etext)
++# define DATASTART_USES_BSDGETDATASTART
++#   endif
++#   ifdef OPENBSD
++# define OS_TYPE "OPENBSD"
++# ifndef GC_OPENBSD_THREADS
++#   include 
++#   include 
++#   define STACKBOTTOM ((ptr_t)USRSTACK)
++# endif
++  extern int __data_start[];
++# define DATASTART ((ptr_t)__data_start)
++  extern int _end[];
++# define DATAEND ((ptr_t)(&_end))
++# define DYNAMIC_LOADING
++#   endif
++#   ifdef NOSYS
++  /* __data_start is usually defined in the target linker script.   */
++  extern int __data_start[];
++# define DATASTART ((ptr_t)__data_start)
++  extern void *__stack_base__;
++# define STACKBOTTOM ((ptr_t)__stack_base__)
+ #   endif
+ # endif
+ 



Re: Work-around for not-shown JPEG images in www/links+

2018-12-29 Thread Ted Unangst
Hannes Wenzel wrote:
> I don't see whether upstream deliberately or accidentally does
> #cmakedefine HAVE_LOCAL_H
> instead of
> #cmakedefine HAVE_LOCAL_H 1
> and I, honestly, don't care. Just want to get this off my mind.

fyi, the port was updated after 6.4 to fix this.

http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/graphics/jpeg/Makefile



[UPDATE] devel/p5-Parse-RecDescent 1.967009 -> 1.967015

2018-12-29 Thread Charlene Wendling


This is an update for devel/p5-Parse-RecDescent that unbreaks tests
with the future Perl 5.28. 

What's new upstream (partial, see [1]): 

- The  directive to eval similar to other  directives,
  rather than being single-quoted in the resulting parser. Please
  note that's it's *not backward compatible*. 
- Fix tests with Perl 5.26+ 

Port-wise, it's a simple version bump. 

Testing: 

- 'make test' passes
- There are 57 consumers, i've found no new failures with that 
  update [2].

Comments/feedback are welcome. 

Charlène. 

[1] https://metacpan.org/changes/distribution/Parse-RecDescent
[2] https://transfer.sh/MxWm7/p5-Parse-RecDescent.tgz

Index: Makefile
===
RCS file: /cvs/ports/devel/p5-Parse-RecDescent/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- Makefile20 Mar 2016 19:56:32 -  1.16
+++ Makefile29 Dec 2018 20:26:51 -
@@ -4,7 +4,7 @@ COMMENT =   perl module to generate recurs
 
 MODULES =  cpan
 PKG_ARCH = *
-DISTNAME = Parse-RecDescent-1.967009
+DISTNAME = Parse-RecDescent-1.967015
 CATEGORIES =   devel
 
 MAINTAINER =   Andrew Fresh 
Index: distinfo
===
RCS file: /cvs/ports/devel/p5-Parse-RecDescent/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo13 May 2014 05:52:18 -  1.6
+++ distinfo29 Dec 2018 20:26:51 -
@@ -1,2 +1,2 @@
-SHA256 (Parse-RecDescent-1.967009.tar.gz) = 
4QAPC4IlYmn7japDqrFmp4MvwYtGia98jW0aSf51xoc=
-SIZE (Parse-RecDescent-1.967009.tar.gz) = 170858
+SHA256 (Parse-RecDescent-1.967015.tar.gz) = 
GUMzaky1TxeIpzPwgnwMVdtDENXq4V5UJjnJ3YVlbjc=
+SIZE (Parse-RecDescent-1.967015.tar.gz) = 176996



Work-around for not-shown JPEG images in www/links+

2018-12-29 Thread Hannes Wenzel
Hello, everybody!

My links+ in 6.4 would not display JPEG images and I figured it was due
to the configure script not detecting jpeglib. My current work-around:

1. define HAVE_LOCAL_H with 1 /usr/local/include/jconfig.h:
-#define HAVE_LOCAL_H
+#define HAVE_LOCAL_H 1
2. rebuild the package
$ cd /usr/ports/www/links+
$ make package
3. (as root) replace with self-compiled package
# cd /usr/ports/packages/all
# pkg_add -vrD unsigned links+*

I don't see whether upstream deliberately or accidentally does
#cmakedefine HAVE_LOCAL_H
instead of
#cmakedefine HAVE_LOCAL_H 1
and I, honestly, don't care. Just want to get this off my mind.

Guten Rutsch!
-- 
Hannes Wenzel 



signature.asc
Description: PGP signature


fix editors/libreoffice with poppler-0.72.0

2018-12-29 Thread Matthias Kilian
Hi,

the diff below would fix the build of libreoffice after the update
of poppler to 0.72.0
(https://marc.info/?l=openbsd-ports&m=154594206203586&w=2).

ok (after the commit of the poppler update in a few days)?

Ciao,
Kili

Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
===
RCS file: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
diff -N patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx 29 Dec 
2018 19:17:53 -
@@ -0,0 +1,106 @@
+$OpenBSD$
+
+Fix with newer poppler. From archlinux.
+
+Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -514,7 +514,7 @@ void PDFOutDev::printPath( GfxPath* pPath )
+ PDFOutDev::PDFOutDev( PDFDoc* pDoc ) :
+ m_pDoc( pDoc ),
+ m_aFontMap(),
+-m_pUtf8Map( new UnicodeMap("UTF-8", gTrue, &mapUTF8) ),
++m_pUtf8Map( new UnicodeMap("UTF-8", true, &mapUTF8) ),
+ m_bSkipImages(false)
+ {
+ }
+@@ -555,7 +555,7 @@ void PDFOutDev::processLink(Link* link, Catalog*)
+ LinkAction* pAction = link->getAction();
+ if (pAction && pAction->getKind() == actionURI)
+ {
+-const char* pURI = 
static_cast(pAction)->getURI()->getCString();
++const char* pURI = static_cast(pAction)->getURI()->c_str();
+ 
+ std::vector aEsc( lcl_escapeLineFeeds(pURI) );
+ 
+@@ -578,7 +578,11 @@ void PDFOutDev::restoreState(GfxState*)
+ printf( "restoreState\n" );
+ }
+ 
++#if POPPLER_CHECK_VERSION(0, 70, 0)
++void PDFOutDev::setDefaultCTM(const double *pMat)
++#else
+ void PDFOutDev::setDefaultCTM(double *pMat)
++#endif
+ {
+ assert(pMat);
+ 
+@@ -753,7 +757,7 @@ void PDFOutDev::updateFont(GfxState *state)
+ 
+ aFont = it->second;
+ 
+-std::vector aEsc( 
lcl_escapeLineFeeds(aFont.familyName.getCString()) );
++std::vector aEsc( 
lcl_escapeLineFeeds(aFont.familyName.c_str()) );
+ printf( " %d %d %d %d %f %d %s",
+ aFont.isEmbedded,
+ aFont.isBold,
+@@ -939,11 +943,11 @@ void PDFOutDev::endTextObject(GfxState*)
+ }
+ 
+ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
+-  int width, int height, GBool invert,
++  int width, int height, bool invert,
+ #if POPPLER_CHECK_VERSION(0, 12, 0)
+-  GBool /*interpolate*/,
++  bool /*interpolate*/,
+ #endif
+-  GBool /*inlineImg*/ )
++  bool /*inlineImg*/ )
+ {
+ if (m_bSkipImages)
+ return;
+@@ -972,9 +976,9 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object
+ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
+   int width, int height, GfxImageColorMap* colorMap,
+ #if POPPLER_CHECK_VERSION(0, 12, 0)
+-  GBool /*interpolate*/,
++  bool /*interpolate*/,
+ #endif
+-  int* maskColors, GBool /*inlineImg*/ )
++  int* maskColors, bool /*inlineImg*/ )
+ {
+ if (m_bSkipImages)
+ return;
+@@ -1023,13 +1027,13 @@ void PDFOutDev::drawMaskedImage(GfxState*, Object*, St
+ int width, int height,
+ GfxImageColorMap* colorMap,
+ #if POPPLER_CHECK_VERSION(0, 12, 0)
+-GBool /*interpolate*/,
++bool /*interpolate*/,
+ #endif
+ Stream* maskStr,
+ int maskWidth, int maskHeight,
+-GBool maskInvert
++bool maskInvert
+ #if POPPLER_CHECK_VERSION(0, 12, 0)
+-, GBool /*maskInterpolate*/
++, bool /*maskInterpolate*/
+ #endif
+)
+ {
+@@ -1045,13 +1049,13 @@ void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*
+ int width, int height,
+ GfxImageColorMap* colorMap,
+ #if POPPLER_CHECK_VERSION(0, 12, 0)
+-GBool /*interpolate*/,
++bool /*interpolate*/,
+ #endif
+ Stream* maskStr,
+ int maskWidth, int maskHeight,
+ GfxImageColorMap* maskColorMap
+ #if POPPLER_CHECK_VERSION(0, 12, 0)
+-, GBool /*maskInterpolate*/
++, bool /*maskInterpolate*/
+ #endif
+  

Re: UPDATE: editors/texworks (was: poppler-qt4)

2018-12-29 Thread Matthias Kilian
Hi,

On Thu, Dec 27, 2018 at 06:03:40PM +, Edd Barrett wrote:
> The double comma thing: I thought that was a typo which happened
> to work, but I'm willing to be proven wrong!

I think it was some copy&paste thing from the past. Some tools did
(still do) output more than just one comma for flavors, but
poppler,-qt5 (with just one comma) is perfectly ok.

> The man path: it was the only way I could get the man page to go
> into the right place. I'll try again over the next few days in
> case I screwed up.

As Landry said: "other than that, if it works for you, okay."

BTW: it builds without any further diffs against poppler-0.72.0.

Ciao,
,   Kili



[UPDATE] devel/p5-Test-SubCalls 1.09 -> 1.10

2018-12-29 Thread Charlene Wendling


Here is a small update for Test::SubCalls, the only change is a move to
Dist::Zilla to allow the module to be installed with our future Perl
5.28 [1]. 

Port wise, it's also a simple version bump, with the usual permissions
fix we need with ETHER's modules ;) 

Testing: 

- 'make test' passes
- There are 277 consumers. I've found no new failures due to this
  update [2].


Any comments/feedback? 

Charlène. 


[1] https://metacpan.org/changes/distribution/Test-SubCalls
[2] https://transfer.sh/Vkfh4/p5-Test-SubCalls.tgz

Index: Makefile
===
RCS file: /cvs/ports/devel/p5-Test-SubCalls/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile20 Mar 2016 19:56:38 -  1.7
+++ Makefile29 Dec 2018 16:50:16 -
@@ -4,9 +4,10 @@ COMMENT=   track the number of times subs
 
 MODULES=   cpan
 PKG_ARCH=  *
-DISTNAME=  Test-SubCalls-1.09
-REVISION=  0
+DISTNAME=  Test-SubCalls-1.10
 CATEGORIES=devel
+
+FIX_EXTRACT_PERMISSIONS=   Yes
 
 MAINTAINER=Jim Razmus II 
 
Index: distinfo
===
RCS file: /cvs/ports/devel/p5-Test-SubCalls/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo18 Jan 2015 03:13:36 -  1.2
+++ distinfo29 Dec 2018 16:50:16 -
@@ -1,2 +1,2 @@
-SHA256 (Test-SubCalls-1.09.tar.gz) = 
ozSwRX2jONeb4tu2LUA3AfyQ92B9+EARX/Re4eK9bnA=
-SIZE (Test-SubCalls-1.09.tar.gz) = 25727
+SHA256 (Test-SubCalls-1.10.tar.gz) = 
y8Hps1oF5x/rwT5e9UejHIJJiZu2AR29ydn/Nm3atsI=
+SIZE (Test-SubCalls-1.10.tar.gz) = 25431



fix devel/tbb on aarch64

2018-12-29 Thread Pascal Stumpf
This is enough to get tbb to build and test successfully on aarch64.


Index: patches/patch-build_OpenBSD_inc
===
RCS file: patches/patch-build_OpenBSD_inc
diff -N patches/patch-build_OpenBSD_inc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-build_OpenBSD_inc 29 Dec 2018 18:18:06 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: build/OpenBSD.inc
+--- build/OpenBSD.inc.orig
 build/OpenBSD.inc
+@@ -24,6 +24,9 @@ ifndef arch
+ ifeq ($(shell uname -m),amd64)
+ export arch:=intel64
+ endif
++  ifeq ($(shell uname -m),arm64)
++  export arch:=aarch64
++  endif
+ endif
+ 
+ ifndef runtime



[Update] editors/tiled 1.2.1

2018-12-29 Thread Max Fillinger
Here's an update to version 1.2.1 for the map editor tiled.  The main
change for the Makefile is that the project is hosted on Github now.



Index: editors/tiled//Makefile
===
RCS file: /cvs/ports/editors/tiled/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- editors/tiled//Makefile 24 Oct 2018 14:28:01 -  1.14
+++ editors/tiled//Makefile 29 Dec 2018 16:08:25 -
@@ -2,10 +2,10 @@
 
 COMMENT =  tile map editor
 
-V =0.9.1
-DISTNAME = tiled-qt-${V}
-PKGNAME =  tiled-${V}
-REVISION = 6
+V =1.2.1
+GH_ACCOUNT =   bjorn
+GH_PROJECT =   tiled
+GH_TAGNAME =   v${V}
 
 SHARED_LIBS += tiled 0.0 # 1.0
 
@@ -16,16 +16,14 @@ HOMEPAGE =  http://www.mapeditor.org/
 # GPLv2+
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB += GL ICE QtGui QtOpenGL SM X11 Xext Xi Xinerama Xrender
+WANTLIB += GL ICE Qt5Gui Qt5OpenGL SM X11 Xext Xi Xinerama Xrender
 WANTLIB += c fontconfig freetype m pthread ${COMPILER_LIBCXX} z
 
 COMPILER = base-clang ports-gcc base-gcc
 
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tiled/}
-
 RUN_DEPENDS =  devel/desktop-file-utils \
x11/gtk+3,-guic
-MODULES =  devel/qmake x11/qt4
+MODULES =  devel/qmake x11/qt5
 
 # XXX qmake picks up Cocoa/Cocoa.h even though it's apparently unused
 DPB_PROPERTIES =   nojunk
Index: editors/tiled//distinfo
===
RCS file: /cvs/ports/editors/tiled/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- editors/tiled//distinfo 28 Apr 2014 09:48:54 -  1.2
+++ editors/tiled//distinfo 29 Dec 2018 16:08:25 -
@@ -1,2 +1,2 @@
-SHA256 (tiled-qt-0.9.1.tar.gz) = aGj4MzuMZoNTAXkgUaduf8aEZ2GbbpeoW1h/U3w2tSc=
-SIZE (tiled-qt-0.9.1.tar.gz) = 1436286
+SHA256 (tiled-1.2.1.tar.gz) = MpLBHC29reK/TVRyNEGIKnfhI7deel+K3D9BUI+fJug=
+SIZE (tiled-1.2.1.tar.gz) = 16773680
Index: 
editors/tiled//patches/patch-src_automappingconverter_automappingconverter_pro
===
RCS file: 
/cvs/ports/editors/tiled/patches/patch-src_automappingconverter_automappingconverter_pro,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_automappingconverter_automappingconverter_pro
--- 
editors/tiled//patches/patch-src_automappingconverter_automappingconverter_pro  
28 Apr 2014 09:48:54 -  1.1
+++ 
editors/tiled//patches/patch-src_automappingconverter_automappingconverter_pro  
29 Dec 2018 16:08:25 -
@@ -1,12 +1,11 @@
-$OpenBSD: patch-src_automappingconverter_automappingconverter_pro,v 1.1 
2014/04/28 09:48:54 bentley Exp $
 src/automappingconverter/automappingconverter.pro.orig Mon Apr 28 
02:32:11 2014
-+++ src/automappingconverter/automappingconverter.pro  Mon Apr 28 02:32:17 2014
-@@ -48,7 +48,7 @@ HEADERS  += \
+--- src/automappingconverter/automappingconverter.pro.orig Mon Nov 26 
23:01:27 2018
 src/automappingconverter/automappingconverter.pro  Mon Nov 26 23:01:56 2018
+@@ -46,7 +46,7 @@ HEADERS  += \
  FORMS+= \
  converterwindow.ui
  
 -manpage.path = $${PREFIX}/share/man/man1/
 +manpage.path = $${PREFIX}/man/man1/
- manpage.files += ../../docs/automappingconverter.1
+ manpage.files += ../../man/automappingconverter.1
  INSTALLS += manpage
  
Index: editors/tiled//patches/patch-src_tiled_tiled_pro
===
RCS file: /cvs/ports/editors/tiled/patches/patch-src_tiled_tiled_pro,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_tiled_tiled_pro
--- editors/tiled//patches/patch-src_tiled_tiled_pro28 Apr 2014 09:48:54 
-  1.2
+++ editors/tiled//patches/patch-src_tiled_tiled_pro29 Dec 2018 16:08:25 
-
@@ -1,12 +1,11 @@
-$OpenBSD: patch-src_tiled_tiled_pro,v 1.2 2014/04/28 09:48:54 bentley Exp $
 src/tiled/tiled.pro.orig   Sat Jul 27 14:34:23 2013
-+++ src/tiled/tiled.proMon Apr 28 01:48:23 2014
-@@ -286,7 +286,7 @@ desktopfile.path = $${PREFIX}/share/applications/
- desktopfile.files += ../../docs/tiled.desktop
- INSTALLS += desktopfile
+--- src/tiled/tiled.pro.orig   Mon Nov 26 23:15:41 2018
 src/tiled/tiled.proMon Nov 26 23:16:00 2018
+@@ -524,7 +524,7 @@ appdatafile.path = $${PREFIX}/share/metainfo/
+ appdatafile.files += ../../org.mapeditor.Tiled.appdata.xml
+ INSTALLS += appdatafile
  
 -manpage.path = $${PREFIX}/share/man/man1/
 +manpage.path = $${PREFIX}/man/man1/
- manpage.files += ../../docs/tiled.1
+ manpage.files += ../../man/tiled.1
  INSTALLS += manpage
  
Index: editors/tiled//pkg/PLIST
===
RCS file: /cvs/ports/editors/tiled/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- editors/tiled//pkg/PLIST29 Jun 2018 22:16:12

Re: UPDATE: bsd.port.mk - Add GitLab support

2018-12-29 Thread Edward Lopez-Acosta
Stuart,

I am not sure I understand the question or the issues you refer to. Can you 
clarify for me so I can look more into it please?

Are you also proposing the GitHub directives already provided are bad as well?

On December 29, 2018 2:40:24 PM UTC, Stuart Henderson  
wrote:
>On 2018/12/29 08:24, Edward Lopez-Acosta wrote:
>> Any feedback for this?
>
>How is gitlab doing at keeping stable distfiles? If it's even worse
>than
>github (and I have a feeling it might be) then I wouldn't really want
>to
>encourage people using it directly as a source.



[UPDATE] devel/p5-MooseX-Has-Sugar 0.05070419 -> 1.000006

2018-12-29 Thread Charlene Wendling


I'm proposing here an update for MooseX::Has::Sugar that fixes tests
with our future Perl 5.28. 

What's new upstream (partial, see [1]) 

- Fixed compile tests to avoid .-in-@INC issues
- Mostly distribution and Pod updates/fixes

What's new in the port: 

- Due to a switch to EUMM, modbuild support has been removed
- Fixed a spacing error by the way

Testing: 

- 'make test' passes
- There are consumers (the Perl+MPD stack) that have been tested. No
  new issues were found [2]

Comments/feedback are welcome. 

Charlène. 

[1] https://metacpan.org/changes/distribution/MooseX-Has-Sugar
[2] https://transfer.sh/CuUAe/p5-MooseX-Has-Sugar.tgz

Index: Makefile
===
RCS file: /cvs/ports/devel/p5-MooseX-Has-Sugar/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile20 Mar 2016 19:56:29 -  1.8
+++ Makefile29 Dec 2018 15:05:09 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.8 2016/03/20 19:56:29 naddy Exp $
 
 COMMENT=   Sugar syntax for moose 'has' fields
-DISTNAME=  MooseX-Has-Sugar-0.05070419
+DISTNAME=  MooseX-Has-Sugar-1.06
 CATEGORIES=devel
 
 # perl
@@ -10,11 +10,9 @@ PERMIT_PACKAGE_CDROM=Yes
 MODULES=   cpan
 PKG_ARCH=  *
 
-CONFIGURE_STYLE=   modbuild
-
 RUN_DEPENDS=   devel/p5-MooseX-Types \
devel/p5-Sub-Exporter \
devel/p5-namespace-autoclean
-TEST_DEPENDS=  devel/p5-Test-Fatal
+TEST_DEPENDS=  devel/p5-Test-Fatal
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/devel/p5-MooseX-Has-Sugar/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo18 Jan 2015 03:13:30 -  1.3
+++ distinfo29 Dec 2018 15:05:09 -
@@ -1,2 +1,2 @@
-SHA256 (MooseX-Has-Sugar-0.05070419.tar.gz) = 
Mlyx5snYhNVKKhMRfecv4nHSIuWFv8OylnYpzXroxDw=
-SIZE (MooseX-Has-Sugar-0.05070419.tar.gz) = 22029
+SHA256 (MooseX-Has-Sugar-1.06.tar.gz) = 
7+7T3bOo6hj0FtSF88KwQnFF0mfmM2jGUdSI6qjCjQk=
+SIZE (MooseX-Has-Sugar-1.06.tar.gz) = 37600



Re: NEW: cad/xschem

2018-12-29 Thread Klemens Nanni
On Thu, Dec 20, 2018 at 10:36:05PM +0200, Hannu Vuolasaho wrote:
> This is my first port so please help me to get it right.
The port looks fairly good, some things:

* V is used once so it can go to DISTNAME directly
* can you avoid the Makefile patch for MANDIR by passing it as configure
  flag?
* the stylistic C fixes should be dropped as they're only churn and do
  not fix actual errors - you can send them upstream
* DEBUG='-g3 -O0' is not picked up, please make sure 
* please use "=" consistently in assignments and keep the
  indent consistent as well as the makefile is a bit hard to read
* please insert empty lines arount NO_TEST and 
* portcheck comment can go
* tcl8.6 is in ports and seems to have different requirements as per
  your comments, I suggest pinning one version with MODTK_VERSION
* xschem(1) references files with "$PREFIX", this should be substituted
  with the actually used prefix

Builds, packages and runs fine otherwise on amd64. Comments:

* Clicking "Waves" then "Cancel" always shows
  "sh: /home/kn/waveview_2013/bin/wv: not found", no idea if if this is
  good or bad
* Selecting some of the simulations shows similar errors:
  "sh: /home/kn/cosmoscope/amd64/ai_bin/cscope: not found"

Maybe someone more familiar with Tcl can help?



Re: UPDATE: bsd.port.mk - Add GitLab support

2018-12-29 Thread Stuart Henderson
On 2018/12/29 08:24, Edward Lopez-Acosta wrote:
> Any feedback for this?

How is gitlab doing at keeping stable distfiles? If it's even worse than
github (and I have a feeling it might be) then I wouldn't really want to
encourage people using it directly as a source.



Re: UPDATE: bsd.port.mk - Add GitLab support

2018-12-29 Thread Edward Lopez-Acosta

Any feedback for this?

Edward Lopez-Acosta

On 12/16/18 9:11 AM, Edward Lopez-Acosta wrote:

Hello,

I spent some time and added GitLab support to bsd.port.mk in a similar 
manner as GitHub. Since Microsoft's acquisition of GitHub a large number 
of projects, including major ones like the freedesktop project, have 
migrated to GitLab. I also have a number of projects at GitLab that I 
have been thinking of porting.


https://about.gitlab.com/2018/06/03/movingtogitlab/
https://about.gitlab.com/2018/08/20/freedesktop-org-migrates-to-gitlab/

I did some tests on this and it seems to work like the GH_* directives 
but would like some additional review if possible please.


Thank you,
diff --git bsd.port.mk bsd.port.mk
index a31757c39fc..ef76d864c8e 100644
--- bsd.port.mk
+++ bsd.port.mk
@@ -129,6 +129,7 @@ _ALL_VARIABLES += HOMEPAGE DISTNAME \
 	SHARED_LIBS TARGETS PSEUDO_FLAVOR \
 	MAINTAINER AUTOCONF_VERSION AUTOMAKE_VERSION CONFIGURE_ARGS \
 	GH_ACCOUNT GH_COMMIT GH_PROJECT GH_TAGNAME PORTROACH \
+	GL_ACCOUNT GL_COMMIT GL_PROJECT GL_TAGNAME \
 	PORTROACH_COMMENT MAKEFILE_LIST USE_LLD USE_WXNEEDED COMPILER \
 	COMPILER_LANGS COMPILER_LINKS SUBST_VARS UPDATE_PLIST_ARGS \
 	PKGPATHS
@@ -620,6 +621,15 @@ GH_PROJECT ?=
 DISTNAME ?=	${GH_PROJECT}-${GH_TAGNAME:C/^v//}
 .endif
 
+GL_TAGNAME ?=
+GL_COMMIT ?=
+GL_ACCOUNT ?=
+GL_PROJECT ?=
+
+.if !empty(GL_PROJECT) && !empty(GL_TAGNAME)
+DISTNAME ?=	${GL_PROJECT}-${GL_TAGNAME:C/^v//}
+.endif
+
 PKGNAME ?= ${DISTNAME}
 FULLPKGNAME ?= ${PKGNAME}${FLAVOR_EXT}
 _MASTER ?=
@@ -868,6 +878,18 @@ WRKDIST ?= ${WRKDIR}/${DISTNAME}
 .  endif
 .endif
 
+.if !empty(GL_TAGNAME)
+WRKDIST ?= ${WRKDIR}/${GL_PROJECT}-${GL_TAGNAME:C/^v//}
+.elif !empty(GL_COMMIT)
+WRKDIST ?= ${WRKDIR}/${GL_PROJECT}-${GL_COMMIT}
+.else
+.  if !defined(DISTNAME)
+WRKDIST ?= ${WRKDIR}
+.  else
+WRKDIST ?= ${WRKDIR}/${DISTNAME}
+.  endif
+.endif
+
 WRKSRC ?= ${WRKDIST}
 
 .if ${SEPARATE_BUILD:L} != "no"
@@ -1184,6 +1206,28 @@ HOMEPAGE ?= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}
 MASTER_SITES ?=
 .endif
 
+.if !empty(GL_ACCOUNT) && !empty(GL_PROJECT)
+.  if !empty(GL_COMMIT) && !empty(GL_TAGNAME)
+ERRORS += "Fatal: specifying both GL_TAGNAME and GL_COMMIT is invalid"
+.  endif
+.  if ${GL_TAGNAME} == master
+ERRORS += "Fatal: using master as GL_TAGNAME is invalid"
+.  endif
+.  if !empty(GL_TAGNAME)
+MASTER_SITES_GITLAB += \
+	https://gitlab.com/${GL_ACCOUNT}/${GL_PROJECT}/-/archive/${GL_TAGNAME:S/$/\//}
+.  else
+MASTER_SITES_GITLAB += \
+	https://gitlab.com/${GL_ACCOUNT}/${GL_PROJECT}/-/archive/${GL_COMMIT}/${GL_PROJECT-}${GL_COMMIT:S/$/\//}
+.  endif
+
+MASTER_SITES ?= ${MASTER_SITES_GITLAB}
+HOMEPAGE ?= https://gitlab.com/${GL_ACCOUNT}/${GL_PROJECT}
+.else
+# Empty declarations to avoid "variable XXX is recursive" errors
+MASTER_SITES ?=
+.endif
+
 # I guess we're in the master distribution business! :)  As we gain mirror
 # sites for distfiles, add them to MASTER_SITE_BACKUP
 
@@ -1211,6 +1255,14 @@ DISTFILES ?= ${DISTNAME}${EXTRACT_SUFX}
 .  endif
 .endif
 
+.if !empty(GL_COMMIT)
+DISTFILES ?= ${DISTNAME}-${GL_COMMIT:C/().*/\1/}${EXTRACT_SUFX}{${GL_COMMIT}${EXTRACT_SUFX}}
+.else
+.  if defined(DISTNAME)
+DISTFILES ?= ${DISTNAME}${EXTRACT_SUFX}
+.  endif
+.endif
+
 PATCHFILES ?=
 SUPDISTFILES ?=
 


Re: NEW: cad/xschem

2018-12-29 Thread Hannu Vuolasaho
Ping

Has anyone taken a look at this?

Best reards,
Hannu Vuolasaho

to 20. jouluk. 2018 klo 22.36 Hannu Vuolasaho (vuokkose...@gmail.com) kirjoitti:
>
> This is my first port so please help me to get it right.
>
> Xschem < http://repo.hu/projects/xschem/ > is a schematic capture program.
> Its main target is simulation. It can also export netlist to pcb-rnd where to
> design the printed circuit board. My next port will be pcb-rnd.
>
> Best regards,
> Hannu Vuolasaho



aarch64 bulk build report

2018-12-29 Thread phessler
bulk build on arm64.ports.openbsd.org
started on  Wed Dec 26 13:46:26 MST 2018
finished at Sat Dec 29 05:56:46 MST 2018
lasted 03D09h10m
done with kern.version=OpenBSD 6.4-current (GENERIC.MP) #340: Tue Dec 25 
00:17:00 MST 2018

built packages:8392
Dec 26:2880
Dec 27:2250
Dec 28:3260
Dec 29:1



critical path missing pkgs:  
http://build-failures.rhaalovely.net/aarch64/2018-12-26/summary.log

build failures: 33
http://build-failures.rhaalovely.net/aarch64/2018-12-26/comms/lcdproc.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/databases/sqlports.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/devel/bullet.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/devel/ode.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/devel/pony-stable.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/devel/tbb.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/editors/xwpe.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/emulators/dynamips.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/emulators/vbam.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/emulators/vice.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/fonts/mftrace.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/games/dungeon-crawl.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/games/frozen-bubble,-main.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/games/spacehulk.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/games/vacuum.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/graphics/freeimage.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/inputmethods/uim.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/japanese/mecab,-ipadic.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/lang/pfe.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/mail/kopano/core.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/math/p5-Math-Int128.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/math/z3.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/misc/rocrail,-gui.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/net/castget.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/print/bg5ps.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/productivity/aqbanking.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/security/libnipper.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/security/softhsm.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/sysutils/sleuthkit.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/textproc/link-grammar,-main.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/www/kwebapp.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/www/mozilla-firefox.log
http://build-failures.rhaalovely.net/aarch64/2018-12-26/x11/p5-Wx.log



Re: [M. UPDATE] net/qbittorrent 4.1.4 -> 4.1.5

2018-12-29 Thread Rafael Sadowski
On Fri Dec 28, 2018 at 12:37:49PM -0300, Elias M. Mariani wrote:
> Changelog:
> https://github.com/qbittorrent/qBittorrent/blob/release-4.1.5/Changelog
> 
> Pretty straightforward patch.
> (the patches were updated to match new files)
> Nothing significant to say...
> 
> Tested both net/qbittorrent/qbittorrent and
> net/qbittorrent/qbittorrent-nox on amd64.
> 
> Comments, OK?
> 
> Elias.

ok rsadowski@



Re: [new] net/libupnpp

2018-12-29 Thread Pascal Stumpf
On Sat, 29 Dec 2018 12:55:02 +0100, Rafael Sadowski wrote:
> On Fri Dec 28, 2018 at 12:11:28PM +0100, Pascal Stumpf wrote:
> > Libupnpp is a C++ wrapper for libupnp, a.k.a Portable UPnP, which
> > is a direct descendant of the Open Source SDK released by Intel in
> > support of UPnP development.
> > 
> > Libupnpp can be used to implement UPnP devices and services, or
> > Control Points.
> > 
> > The Control Point side of libupnpp, which is documented here, allows
> > a C++ program to discover UPnP devices, and exchange commands and
> > status with them.
> > 
> > The library has a number of predefined modules for controlling
> > specific AVTransport or OpenHome audio services, and it is relatively
> > easy to add modules for other services externally (the internal
> > modules have no more access to library internals than an external
> > module would).
> > 
> > 
> > OK?
> 
> Build and package fine with clang on amd64.
> 
> "CXX=g++ make" configure fine but fails at compile step (Of course,
> it's c++11) but there is no COMPILER var in Makefile.
> 
> $ CXX=eg++ make
> checking whether eg++ accepts -g... (cached) yes
> checking dependency style of eg++... none
> checking how to run the C++ preprocessor... /lib/cpp
> configure: error: in `/usr/ports/pobj/libupnpp-0.16.1/libupnpp-0.16.1':
> configure: error: C++ preprocessor "/lib/cpp" fails sanity check
> See `config.log' for more details

Works fine if you set both CXX=eg++ and CC=egcc.

Updated tarball with COMPILER = base-clang ports-gcc ...


libupnpp.tgz
Description: libupnpp.tgz


Re: poppler-qt4 (was: CVS: cvs.openbsd.org: ports)

2018-12-29 Thread Rafael Sadowski
On Sat Dec 29, 2018 at 01:20:08PM +0100, Matthias Kilian wrote:
> Hi,
> 
> On Mon, Dec 10, 2018 at 04:51:31PM +0100, Rafael Sadowski wrote:
> > On Mon Dec 10, 2018 at 10:47:11AM +0100, Matthias Kilian wrote:
> > > x11/kde4/kfilemetadata
> > > x11/kde4/nepomuk-core
> > 
> > Patches attached to disable poppler-qt4 support in kfilemetadata and
> > nepomuk-core. We are still far away to replace these two kde4
> > applications with kde5

Feel free to commit the patches with my ok. You certainly have the
better timing.

> 
> Those at least built without problems for me (on amd64). So ok from
> me.
> 
> > > x11/kde4/okular
> > > 
> > 
> > KDE5 replacement here:
> > https://marc.info/?l=openbsd-ports&m=154300624119383&w=2
> 
> I don't use kde and can't comment on it (and your followup on it
> from december 12th). If it goes in, the diff I just sent for
> x11/kde4/okular is obsolete, right?
> 

Correct.

Rafael Sadowski



Re: x11/kde4/okular: drop poppler-qt4 dependency

2018-12-29 Thread Rafael Sadowski
Hi,

maybe totally useless. Let's move forward with KDE5 okular:

https://sizeofvoid.org/pub/OpenBSD/kde-applications/graphics/okular-18.12.0.tar.gz

We can solve two problems with one move.

Rafael Sadowski

On Sat Dec 29, 2018 at 01:08:54PM +0100, Matthias Kilian wrote:
> Hi,
> 
> the diff below removes the poppler-qt4 dependency from x11/kde4/okular.
> I've no idea how useful okular will be without poppler-qt4, but at
> least it still builds for me.
> 
> ok?
> 
> Ciao,
>   Kili
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/kde4/okular/Makefile,v
> retrieving revision 1.24
> diff -u -p -r1.24 Makefile
> --- Makefile  29 Jun 2018 22:16:32 -  1.24
> +++ Makefile  29 Dec 2018 12:03:53 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT =KDE document viewer
>  DISTNAME =   okular-${MODKDE4_VERSION}
> -REVISION =   8
> +REVISION =   9
>  
>  SHARED_LIBS =okularcore  51.0# 1.7
>  
> @@ -16,7 +16,7 @@ WANTLIB += ${KDE4LIB}/kio ${KDE4LIB}/kjs
>  WANTLIB += ${KDE4LIB}/kparts ${KDE4LIB}/kprintutils ${KDE4LIB}/kpty
>  WANTLIB += ${KDE4LIB}/nepomuk ${KDE4LIB}/nepomukutils
>  WANTLIB += ${KDE4LIB}/qmobipocket
> -WANTLIB += chm djvulibre epub freetype jpeg kscreen poppler-qt4 qca 
> qimageblitz
> +WANTLIB += chm djvulibre epub freetype jpeg kscreen qca qimageblitz
>  WANTLIB += qjson soprano solid spectre threadweaver tiff
>  
>  MODULES =multimedia/phonon
> @@ -30,7 +30,6 @@ LIB_DEPENDS =   devel/chmlib \
>   graphics/qimageblitz \
>   graphics/tiff \
>   print/libspectre \
> - print/poppler,,-qt4 \
>   security/qca \
>   textproc/ebook-tools \
>   x11/libkscreen<5 \
> @@ -39,7 +38,8 @@ LIB_DEPENDS =   devel/chmlib \
>   ${MODKDE4_DEP_DIR}/libkexiv2>=${MODKDE4_DEP_VERSION}
>  
>  # Not ported yet, extragear stuff
> -CONFIGURE_ARGS = -DWITH_ActiveApp=No
> +CONFIGURE_ARGS = -DWITH_ActiveApp=No \
> + -DCMAKE_DISABLE_FIND_PACKAGE_Poppler=True
>  
>  TEST_IS_INTERACTIVE =X11
>  
> Index: patches/patch-cmake_modules_FindPoppler_cmake
> ===
> RCS file: patches/patch-cmake_modules_FindPoppler_cmake
> diff -N patches/patch-cmake_modules_FindPoppler_cmake
> --- patches/patch-cmake_modules_FindPoppler_cmake 24 Apr 2013 18:34:39 
> -  1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-cmake_modules_FindPoppler_cmake,v 1.1.1.1 2013/04/24 
> 18:34:39 zhuk Exp $
>  cmake/modules/FindPoppler.cmake.orig Tue Oct 11 04:18:26 2011
> -+++ cmake/modules/FindPoppler.cmake  Tue Oct 11 04:19:22 2011
> -@@ -57,6 +57,10 @@ endif(NOT _poppler_version_bad)
> - if (POPPLER_FOUND)
> -   include(CheckCXXSourceCompiles)
> - 
> -+  # Unbreak Qt4 linking after QT_USE_IMPORTED_TARGETS set in KDE config
> -+  set(QT_USE_IMPORTED_TARGETS FALSE)
> -+  find_package(Qt4)
> -+
> -   # check whether we're using poppler 0.6
> -   set(CMAKE_REQUIRED_INCLUDES ${POPPLER_INCLUDE_DIR} ${QT_INCLUDE_DIR})
> -   set(CMAKE_REQUIRED_LIBRARIES ${POPPLER_LIBRARY} ${QT_QTCORE_LIBRARY} 
> ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY})
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/x11/kde4/okular/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -r1.7 PLIST
> --- pkg/PLIST 29 Jun 2018 22:16:32 -  1.7
> +++ pkg/PLIST 29 Dec 2018 12:03:53 -
> @@ -52,7 +52,6 @@ lib/kde4/okularGenerator_kimgio.so
>  lib/kde4/okularGenerator_mobi.so
>  lib/kde4/okularGenerator_ooo.so
>  lib/kde4/okularGenerator_plucker.so
> -lib/kde4/okularGenerator_poppler.so
>  lib/kde4/okularGenerator_tiff.so
>  lib/kde4/okularGenerator_txt.so
>  lib/kde4/okularGenerator_xps.so
> @@ -69,7 +68,6 @@ share/applications/kde4/active-documentv
>  share/applications/kde4/active-documentviewer_ghostview.desktop
>  share/applications/kde4/active-documentviewer_kimgio.desktop
>  share/applications/kde4/active-documentviewer_ooo.desktop
> -share/applications/kde4/active-documentviewer_pdf.desktop
>  share/applications/kde4/active-documentviewer_plucker.desktop
>  share/applications/kde4/active-documentviewer_tiff.desktop
>  share/applications/kde4/active-documentviewer_txt.desktop
> @@ -86,7 +84,6 @@ share/applications/kde4/okularApplicatio
>  share/applications/kde4/okularApplication_kimgio.desktop
>  share/applications/kde4/okularApplication_mobi.desktop
>  share/applications/kde4/okularApplication_ooo.desktop
> -share/applications/kde4/okularApplication_pdf.desktop
>  share/applications/kde4/okularApplication_plucker.desktop
>  share/applications/kde4/okularApplication_tiff.desktop
>  share/applications/kde4/okularApplication_txt.desktop
> @@ -141,7 +138,6 @@ share/apps/okular/tools.xml
>  share/config.kcfg/gssettings.kcfg
>  share/config.kcfg/okular.kcfg
>  share/config.kcfg/okular_core.k

Re: poppler-qt4 (was: CVS: cvs.openbsd.org: ports)

2018-12-29 Thread Matthias Kilian
Hi,

On Mon, Dec 10, 2018 at 04:51:31PM +0100, Rafael Sadowski wrote:
> On Mon Dec 10, 2018 at 10:47:11AM +0100, Matthias Kilian wrote:
> > x11/kde4/kfilemetadata
> > x11/kde4/nepomuk-core
> 
> Patches attached to disable poppler-qt4 support in kfilemetadata and
> nepomuk-core. We are still far away to replace these two kde4
> applications with kde5

Those at least built without problems for me (on amd64). So ok from
me.

> > x11/kde4/okular
> > 
> 
> KDE5 replacement here:
> https://marc.info/?l=openbsd-ports&m=154300624119383&w=2

I don't use kde and can't comment on it (and your followup on it
from december 12th). If it goes in, the diff I just sent for
x11/kde4/okular is obsolete, right?

Ciao,
Kili


> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/kde4/nepomuk-core/Makefile,v
> retrieving revision 1.13
> diff -u -p -u -p -r1.13 Makefile
> --- Makefile  27 Jun 2018 21:04:19 -  1.13
> +++ Makefile  10 Dec 2018 10:28:25 -
> @@ -2,10 +2,9 @@
>  
>  COMMENT =KDE Nepomuk core libraries
>  DISTNAME =   nepomuk-core-${MODKDE4_VERSION}
> -REVISION =   2
> +REVISION =   3
>  
>  SHARED_LIBS =nepomukcore 53.0 # 4.9
> -#SHARED_LIBS +=  nepomuksync 0.0 # 4.9
>  SHARED_LIBS +=   nepomukcommon   53.0 # 4.10
>  SHARED_LIBS +=   kdeinit4_nepomukserver  53.0 # 4.10
>  SHARED_LIBS +=   nepomukextractor53.0
> @@ -19,7 +18,7 @@ WANTLIB += ${KDE4LIB}/baloocore ${KDE4LI
>  WANTLIB += ${KDE4LIB}/balooqueryparser
>  WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/kidletime ${KDE4LIB}/kio
>  WANTLIB += ${KDE4LIB}/solid
> -WANTLIB += avcodec avformat avutil epub exiv2 poppler-qt4 soprano
> +WANTLIB += avcodec avformat avutil epub exiv2 soprano
>  WANTLIB += sopranoserver tag
>  
>  MODKDE4_USE =libs
> @@ -33,11 +32,11 @@ LIB_DEPENDS = audio/taglib \
>   databases/soprano>=2.9.3 \
>   graphics/exiv2 \
>   graphics/ffmpeg \
> - print/poppler,,-qt4 \
>   textproc/ebook-tools \
>   ${MODKDE4_DEP_DIR}/baloo>=${MODKDE4_DEP_VERSION}
>  
>  CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket=True \
> - -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:Bool=Yes
> + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=True \
> + -DCMAKE_DISABLE_FIND_PACKAGE_PopplerQt4=True
>  
>  .include 
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/x11/kde4/nepomuk-core/pkg/PLIST,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 PLIST
> --- pkg/PLIST 27 Jun 2018 21:04:19 -  1.6
> +++ pkg/PLIST 10 Dec 2018 10:28:25 -
> @@ -140,7 +140,6 @@ lib/kde4/nepomukodfextractor.so
>  lib/kde4/nepomukoffice2007extractor.so
>  lib/kde4/nepomukofficeextractor.so
>  lib/kde4/nepomukplaintextextractor.so
> -lib/kde4/nepomukpopplerextractor.so
>  lib/kde4/nepomuktaglibextractor.so
>  @lib lib/libkdeinit4_nepomukserver.so.${LIBkdeinit4_nepomukserver_VERSION}
>  @lib lib/libnepomukcleaner.so.${LIBnepomukcleaner_VERSION}
> @@ -182,7 +181,6 @@ share/kde4/services/nepomukoffice2007ext
>  share/kde4/services/nepomukofficeextractor.desktop
>  share/kde4/services/nepomukontologyloader.desktop
>  share/kde4/services/nepomukplaintextextractor.desktop
> -share/kde4/services/nepomukpopplerextractor.desktop
>  share/kde4/services/nepomukqueryservice.desktop
>  share/kde4/services/nepomukremovablestorageservice.desktop
>  share/kde4/services/nepomukstorage.desktop

> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/kde4/kfilemetadata/Makefile,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 Makefile
> --- Makefile  27 Jul 2017 11:57:48 -  1.4
> +++ Makefile  10 Dec 2018 15:50:37 -
> @@ -2,28 +2,26 @@
>  
>  COMMENT =file metadata extraction library for KDE
>  DISTNAME =   kfilemetadata-${MODKDE4_VERSION}
> -REVISION =   1
> +REVISION =   2
>  
>  CATEGORIES = sysutils
> +
>  HOMEPAGE =   https://projects.kde.org/projects/kde/kdelibs/kfilemetadata
>  
>  SHARED_LIBS =kfilemetadata   1.0
>  
> -WANTLIB =  m pthread
> -WANTLIB += ${COMPILER_LIBCXX}
> -WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork
> -WANTLIB += lib/qt4/QtSvg lib/qt4/QtXml
> -WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/kio
> -WANTLIB += avcodec avformat avutil epub exiv2 poppler-qt4 tag
> +WANTLIB += ${COMPILER_LIBCXX} lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork
> +WANTLIB += lib/qt4/QtSvg lib/qt4/QtXml avcodec avformat avutil epub exiv2
> +WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/kio m tag
>  
>  MODKDE4_USE =libs
>  
> -CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket=True
> +CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket=True \
> + -DCMAKE_DISABLE_FIND_PACKAGE_PopplerQt4=True
>  
>  LIB_DEPENDS =audio/ta

update youtube-dl

2018-12-29 Thread Klemens Nanni
Some new extractors; youtube and other sites keep working fine.

OK?

Index: Makefile
===
RCS file: /cvs/ports/www/youtube-dl/Makefile,v
retrieving revision 1.181
diff -u -p -r1.181 Makefile
--- Makefile8 Nov 2018 21:39:59 -   1.181
+++ Makefile29 Dec 2018 12:13:07 -
@@ -2,7 +2,7 @@
 
 COMMENT =  CLI program to download videos from YouTube and other sites
 
-VERSION =  2018.11.07
+VERSION =  2018.12.17
 MODPY_EGG_VERSION =${VERSION:S/.0/./g}
 
 DISTNAME = youtube-dl-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/www/youtube-dl/distinfo,v
retrieving revision 1.168
diff -u -p -r1.168 distinfo
--- distinfo8 Nov 2018 21:39:59 -   1.168
+++ distinfo29 Dec 2018 12:14:02 -
@@ -1,2 +1,2 @@
-SHA256 (youtube-dl-2018.11.07.tar.gz) = 
afb3vDKA/o/Ik0cFCwcHLlH8ymPTHaUx81PUNUUVbOc=
-SIZE (youtube-dl-2018.11.07.tar.gz) = 3053158
+SHA256 (youtube-dl-2018.12.17.tar.gz) = 
M+uIhpY3pvAZJSNI70cAQtW/HuOplnNqo7uMxkf+pNk=
+SIZE (youtube-dl-2018.12.17.tar.gz) = 3074432
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/youtube-dl/pkg/PLIST,v
retrieving revision 1.121
diff -u -p -r1.121 PLIST
--- pkg/PLIST   8 Nov 2018 21:39:59 -   1.121
+++ pkg/PLIST   29 Dec 2018 12:15:58 -
@@ -154,6 +154,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}chilloutzone.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}chirbit.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}cinchcast.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}ciscolive.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}cjsw.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}cliphunter.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}clippit.${MODPY_PYC_MAGIC_TAG}pyc
@@ -368,6 +369,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}lcp.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}learnr.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}lecture2go.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}lecturio.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}leeco.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}lego.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}lemonde.${MODPY_PYC_MAGIC_TAG}pyc
@@ -643,6 +645,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}tastytrade.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}tbs.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}tdslifeway.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}teachable.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}teachertube.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}teachingchannel.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}teamcoco.${MODPY_PYC_MAGIC_TAG}pyc
@@ -671,6 +674,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}thisav.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}thisoldhouse.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}threeqsdn.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}tiktok.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}tinypic.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}tmz.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}tnaflix.${MODPY_PYC_MAGIC_TAG}pyc
@@ -723,7 +727,6 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/youtube_d

Re: x11/kde-applications #1 - A bunch of new ports

2018-12-29 Thread Rafael Sadowski
On Wed Dec 19, 2018 at 09:09:26AM +0100, Rafael Sadowski wrote:
> On Tue Dec 18, 2018 at 04:31:35PM +0100, Rafael Sadowski wrote:
> > |-- games
> > |   |-- kajongg-18.12.0.tar.gz
> > |   |-- kmines-18.12.0.tar.gz
> > |   |-- kshisen-18.12.0.tar.gz
> > |   |-- ksnakeduel-18.12.0.tar.gz
> > |   |-- kspaceduel-18.12.0.tar.gz
> > |   |-- ksquares-18.12.0.tar.gz
> > |   |-- ksudoku-18.12.0.tar.gz
> > |   |-- ktuberling-18.12.0.tar.gz
> > |   |-- kubrick-18.12.0.tar.gz
> > |   |-- lskat-18.12.0.tar.gz
> > |   `-- palapeli-18.12.0.tar.gz
> 
> All KDE5 have now been committed!
> 
> Many thanks to Brian Callahan for this review marathon with many good
> points and love for the detail.
> 
> ... and let's move on.
> 
> Rafael Sadowksi
> 

Last tree update for 2018. There is much to build and test, so fetch one and
send me your feedback/ok.

Highlights like okular and gwenview still waiting for an ok. ;)

Best regards,

Rafael Sadowski

kde-applications
├── accessibility
│   └── kmouth-18.12.0.tar.gz
├── admin
│   └── kcron-18.12.0.tar.gz
├── base
│   └── kdialog-18.12.0.tar.gz
├── development
│   ├── grantleetheme-18.12.0.tar.gz
│   ├── kcontacts-18.12.0.tar.gz
│   └── kidentitymanagement-18.12.0.tar.gz
├── education
│   ├── kgeography-18.12.0.tar.gz
│   ├── kturtle-18.12.0.tar.gz
│   ├── kwordquiz-18.12.0.tar.gz
│   ├── minuet-18.12.0.tar.gz
│   └── rocs-18.12.0.tar.gz
├── games
│   └── picmi-18.12.0.tar.gz
├── graphics
│   ├── gwenview-18.12.0.tar.gz
│   ├── kamera-18.12.0.tar.gz
│   ├── kcolorchooser-18.12.0.tar.gz
│   ├── kdegraphics-thumbnailers-18.12.0.tar.gz
│   ├── kolourpaint-18.12.0.tar.gz
│   ├── kruler-18.12.0.tar.gz
│   └── okular-18.12.0.tar.gz
├── kdesdk
├── ktp
├── multimedia
├── network
│   ├── kdenetwork-filesharing-18.12.0.tar.gz
│   └── kget-18.12.0.tar.gz
├── pim
├── utilities
│   └── sweeper-18.12.0.tar.gz
└── webdev



x11/kde4/okular: drop poppler-qt4 dependency

2018-12-29 Thread Matthias Kilian
Hi,

the diff below removes the poppler-qt4 dependency from x11/kde4/okular.
I've no idea how useful okular will be without poppler-qt4, but at
least it still builds for me.

ok?

Ciao,
Kili

Index: Makefile
===
RCS file: /cvs/ports/x11/kde4/okular/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile29 Jun 2018 22:16:32 -  1.24
+++ Makefile29 Dec 2018 12:03:53 -
@@ -2,7 +2,7 @@
 
 COMMENT =  KDE document viewer
 DISTNAME = okular-${MODKDE4_VERSION}
-REVISION = 8
+REVISION = 9
 
 SHARED_LIBS =  okularcore  51.0# 1.7
 
@@ -16,7 +16,7 @@ WANTLIB += ${KDE4LIB}/kio ${KDE4LIB}/kjs
 WANTLIB += ${KDE4LIB}/kparts ${KDE4LIB}/kprintutils ${KDE4LIB}/kpty
 WANTLIB += ${KDE4LIB}/nepomuk ${KDE4LIB}/nepomukutils
 WANTLIB += ${KDE4LIB}/qmobipocket
-WANTLIB += chm djvulibre epub freetype jpeg kscreen poppler-qt4 qca qimageblitz
+WANTLIB += chm djvulibre epub freetype jpeg kscreen qca qimageblitz
 WANTLIB += qjson soprano solid spectre threadweaver tiff
 
 MODULES =  multimedia/phonon
@@ -30,7 +30,6 @@ LIB_DEPENDS = devel/chmlib \
graphics/qimageblitz \
graphics/tiff \
print/libspectre \
-   print/poppler,,-qt4 \
security/qca \
textproc/ebook-tools \
x11/libkscreen<5 \
@@ -39,7 +38,8 @@ LIB_DEPENDS = devel/chmlib \
${MODKDE4_DEP_DIR}/libkexiv2>=${MODKDE4_DEP_VERSION}
 
 # Not ported yet, extragear stuff
-CONFIGURE_ARGS =   -DWITH_ActiveApp=No
+CONFIGURE_ARGS =   -DWITH_ActiveApp=No \
+   -DCMAKE_DISABLE_FIND_PACKAGE_Poppler=True
 
 TEST_IS_INTERACTIVE =  X11
 
Index: patches/patch-cmake_modules_FindPoppler_cmake
===
RCS file: patches/patch-cmake_modules_FindPoppler_cmake
diff -N patches/patch-cmake_modules_FindPoppler_cmake
--- patches/patch-cmake_modules_FindPoppler_cmake   24 Apr 2013 18:34:39 
-  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-cmake_modules_FindPoppler_cmake,v 1.1.1.1 2013/04/24 18:34:39 
zhuk Exp $
 cmake/modules/FindPoppler.cmake.orig   Tue Oct 11 04:18:26 2011
-+++ cmake/modules/FindPoppler.cmakeTue Oct 11 04:19:22 2011
-@@ -57,6 +57,10 @@ endif(NOT _poppler_version_bad)
- if (POPPLER_FOUND)
-   include(CheckCXXSourceCompiles)
- 
-+  # Unbreak Qt4 linking after QT_USE_IMPORTED_TARGETS set in KDE config
-+  set(QT_USE_IMPORTED_TARGETS FALSE)
-+  find_package(Qt4)
-+
-   # check whether we're using poppler 0.6
-   set(CMAKE_REQUIRED_INCLUDES ${POPPLER_INCLUDE_DIR} ${QT_INCLUDE_DIR})
-   set(CMAKE_REQUIRED_LIBRARIES ${POPPLER_LIBRARY} ${QT_QTCORE_LIBRARY} 
${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY})
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/kde4/okular/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST   29 Jun 2018 22:16:32 -  1.7
+++ pkg/PLIST   29 Dec 2018 12:03:53 -
@@ -52,7 +52,6 @@ lib/kde4/okularGenerator_kimgio.so
 lib/kde4/okularGenerator_mobi.so
 lib/kde4/okularGenerator_ooo.so
 lib/kde4/okularGenerator_plucker.so
-lib/kde4/okularGenerator_poppler.so
 lib/kde4/okularGenerator_tiff.so
 lib/kde4/okularGenerator_txt.so
 lib/kde4/okularGenerator_xps.so
@@ -69,7 +68,6 @@ share/applications/kde4/active-documentv
 share/applications/kde4/active-documentviewer_ghostview.desktop
 share/applications/kde4/active-documentviewer_kimgio.desktop
 share/applications/kde4/active-documentviewer_ooo.desktop
-share/applications/kde4/active-documentviewer_pdf.desktop
 share/applications/kde4/active-documentviewer_plucker.desktop
 share/applications/kde4/active-documentviewer_tiff.desktop
 share/applications/kde4/active-documentviewer_txt.desktop
@@ -86,7 +84,6 @@ share/applications/kde4/okularApplicatio
 share/applications/kde4/okularApplication_kimgio.desktop
 share/applications/kde4/okularApplication_mobi.desktop
 share/applications/kde4/okularApplication_ooo.desktop
-share/applications/kde4/okularApplication_pdf.desktop
 share/applications/kde4/okularApplication_plucker.desktop
 share/applications/kde4/okularApplication_tiff.desktop
 share/applications/kde4/okularApplication_txt.desktop
@@ -141,7 +138,6 @@ share/apps/okular/tools.xml
 share/config.kcfg/gssettings.kcfg
 share/config.kcfg/okular.kcfg
 share/config.kcfg/okular_core.kcfg
-share/config.kcfg/pdfsettings.kcfg
 share/doc/HTML/en/okular/
 share/doc/HTML/en/okular/annotation-properties.png
 share/doc/HTML/en/okular/annotations.png
@@ -191,7 +187,6 @@ share/kde4/services/libokularGenerator_k
 share/kde4/services/libokularGenerator_mobi.desktop
 share/kde4/services/libokularGenerator_ooo.desktop
 share/kde4/services/libokularGenerator_plucker.desktop
-share/kde4/services/libokularGenerator_poppler.desktop
 share/kde4/services/

Re: [new] net/libupnpp

2018-12-29 Thread Rafael Sadowski
On Fri Dec 28, 2018 at 12:11:28PM +0100, Pascal Stumpf wrote:
> Libupnpp is a C++ wrapper for libupnp, a.k.a Portable UPnP, which
> is a direct descendant of the Open Source SDK released by Intel in
> support of UPnP development.
> 
> Libupnpp can be used to implement UPnP devices and services, or
> Control Points.
> 
> The Control Point side of libupnpp, which is documented here, allows
> a C++ program to discover UPnP devices, and exchange commands and
> status with them.
> 
> The library has a number of predefined modules for controlling
> specific AVTransport or OpenHome audio services, and it is relatively
> easy to add modules for other services externally (the internal
> modules have no more access to library internals than an external
> module would).
> 
> 
> OK?

Build and package fine with clang on amd64.

"CXX=g++ make" configure fine but fails at compile step (Of course,
it's c++11) but there is no COMPILER var in Makefile.

$ CXX=eg++ make
checking whether eg++ accepts -g... (cached) yes
checking dependency style of eg++... none
checking how to run the C++ preprocessor... /lib/cpp
configure: error: in `/usr/ports/pobj/libupnpp-0.16.1/libupnpp-0.16.1':
configure: error: C++ preprocessor "/lib/cpp" fails sanity check
See `config.log' for more details


Rafael Sadowski



[UPDATE] devel/p5-Data-FormValidator 4.63 -> 4.88

2018-12-29 Thread Charlene Wendling
Hi ports, 

Here is an update for Data::FormValidator that fixes the build with our
future Perl 5.28, and unbreaks tests with our current Perl. 

There are 10 years of changelog, so i'm not detailing here [1]. 

What's new in the port: 

- It uses EUMM now, so modbuild is not needed anymore
- Dropped some unused dependencies
- Updated test depends, added hidden ones, enabled pod testing
- Made spacing more consistent

Testing: 

- 'make test' passes
- There are consumers that i've tested [2], and all pass. 

Any comments/feedback? 

Charlène. 

[1] https://metacpan.org/changes/distribution/Data-FormValidator
[2] https://transfer.sh/zZoEo/p5-Data-FormValidator.tgz

Index: Makefile
===
RCS file: /cvs/ports/devel/p5-Data-FormValidator/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- Makefile20 Mar 2016 19:56:17 -  1.14
+++ Makefile29 Dec 2018 10:24:01 -
@@ -1,25 +1,25 @@
 # $OpenBSD: Makefile,v 1.14 2016/03/20 19:56:17 naddy Exp $
 
-COMMENT=validate user input from a constraint object
+COMMENT=   validate user input from a constraint object
 
 MODULES=   cpan
 PKG_ARCH=  *
-DISTNAME=  Data-FormValidator-4.63
-REVISION=  1
-CATEGORIES= devel
+DISTNAME=  Data-FormValidator-4.88
+CATEGORIES=devel
 
 # perl
 PERMIT_PACKAGE_CDROM=   Yes
 
 RUN_DEPENDS=   graphics/p5-Image-Size \
devel/p5-Date-Calc \
-   devel/p5-Perl6-Junction \
misc/p5-File-MMagic \
mail/p5-Email-Valid \
mail/p5-MIME-Types \
textproc/p5-Regexp-Common
-TEST_DEPENDS=www/p5-CGI-Simple
+TEST_DEPENDS=  textproc/p5-Template \
+   www/p5-CGI \
+   www/p5-CGI-Simple
 
-CONFIGURE_STYLE=modbuild
+MAKE_ENV +=TEST_POD=Yes
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/devel/p5-Data-FormValidator/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo18 Jan 2015 03:13:24 -  1.6
+++ distinfo29 Dec 2018 10:24:01 -
@@ -1,2 +1,2 @@
-SHA256 (Data-FormValidator-4.63.tar.gz) = 
NfBmauuPSDZ7bQEUXO22u72RrPXnuL0JYFNsRAB7dJ4=
-SIZE (Data-FormValidator-4.63.tar.gz) = 96892
+SHA256 (Data-FormValidator-4.88.tar.gz) = 
waU5+RySy82KjYNZfsmnZD/NjM9alOFTgsN2UokXAGY=
+SIZE (Data-FormValidator-4.88.tar.gz) = 99850
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/p5-Data-FormValidator/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   6 Nov 2006 11:53:51 -   1.1.1.1
+++ pkg/PLIST   29 Dec 2018 10:24:01 -
@@ -9,6 +9,7 @@ ${P5SITE}/Data/FormValidator/Constraints
 ${P5SITE}/Data/FormValidator/ConstraintsFactory.pm
 ${P5SITE}/Data/FormValidator/Filters.pm
 ${P5SITE}/Data/FormValidator/Results.pm
+${P5SITE}/Data/README.pod
 @man man/man3p/Data::FormValidator.3p
 @man man/man3p/Data::FormValidator::Constraints.3p
 @man man/man3p/Data::FormValidator::Constraints::Dates.3p
@@ -16,3 +17,4 @@ ${P5SITE}/Data/FormValidator/Results.pm
 @man man/man3p/Data::FormValidator::ConstraintsFactory.3p
 @man man/man3p/Data::FormValidator::Filters.3p
 @man man/man3p/Data::FormValidator::Results.3p
+@man man/man3p/Data::README.3p



[new] multimedia/upplay

2018-12-29 Thread Pascal Stumpf
upplay is a desktop UPnP audio Control Point for Linux/Unix and MS
Windows.

upplay does not play music, it controls a Media Renderer which may
be running on the same host or anywhere else.

Features:
* Plays gapless using either the UPnP SetNextTransportURI action
  or the OpenHome Playlist service, depending on the device capabilities.
  OpenHome is chosen by default if available.
* In AVT mode, remembers the last playlist.
* Can move your current playlist to another renderer.
* Lets you browse any UPnP Content Directory on the local network and
  add music from there (click titles, or use the right-click menu for
  directory adds).
* Supports multiple browsing tabs
* Lets you search the server, and the local listing.
* Can control the connections between multiple Linn Songcast Senders and
  Receivers (multiroom synchronized playing).


This depends on libupnpp (which I sent yesterday).

OK?


upplay.tgz
Description: upplay.tgz