CVS: cvs.openbsd.org: ports

[Dmitrij Czarkoff]

CVSROOT:/cvs
Module name:ports
Changes by: czark...@cvs.openbsd.org2016/10/22 19:59:16

Modified files:
net/gpodder: Makefile distinfo 
net/gpodder/patches: patch-makefile 
net/gpodder/pkg: PLIST 
Removed files:
net/gpodder/patches: patch-setup_py 

Log message:
Update to gpodder 3.9.1

>From Tim Meunier (new MAINTAINER)

Re: UPDATE: sysutils/entr

[Jeremie Courreges-Anglas]

Rafael Sadowski  writes:

> Hi ports@, Eric Radman,
>
> simple patch to the last stable version.

Committed, thanks.

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

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/22 18:21:24

Modified files:
sysutils/entr  : Makefile distinfo 

Log message:
Update to entr-3.6

>From Rafael Sadowski, maintainer timeout.

Re: [NEW] cbmc - Bounded Model Checker for C and C++

[Jeremie Courreges-Anglas]

cbmc has been imported.

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

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/22 18:14:33

Modified files:
devel  : Makefile 

Log message:
+cbmc

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/22 18:13:10

Log message:
Import CBMC, a model checker for C and C++.

Port by Simon Mages (maintainer) with input from Jan Klemkow, sthen@
and myself.  ok sthen@

DESCR:
CBMC is a Bounded Model Checker for C and C++ programs. It supports C89, 
C99,
most of C11 and most compiler extensions provided by gcc and Visual Studio. 
It
also supports SystemC using Scoot, and has experimental support for Java
Bytecode.

CBMC verifies array bounds (buffer overflows), pointer safety, exceptions
and user-specified assertions. Furthermore, it can check C and C++ for
consistency with other languages, such as Verilog. The verification is
performed by unwinding the loops in the program and passing the resulting
equation to a decision procedure.

While CBMC is aimed for embedded software, it also supports dynamic memory
allocation using malloc and new.

CBMC comes with a built-in solver for bit-vector formulas that is based on
MiniSat. As an alternative, CBMC has featured support for external SMT
solvers. Recommended solvers are (in no particular order) Boolector,
MathSAT, Yices 2 and Z3. Note that these solvers need to be installed
separately and have different licensing conditions.

Status:

Vendor Tag: jca
Release Tags:   jca_20161023

N ports/devel/cbmc/Makefile
N ports/devel/cbmc/distinfo
N ports/devel/cbmc/patches/patch-src_big-int_allocainc_h
N ports/devel/cbmc/patches/patch-src_common
N ports/devel/cbmc/pkg/PLIST
N ports/devel/cbmc/pkg/DESCR

No conflicts created by this import

Re: UPDATE: devel/doxygen

[Donovan Watteau]

Hi,

Rafael Sadowski wrote:
> On Tue Sep 20, 2016 at 01:33:34AM +0100, Stuart Henderson wrote:
>> These plist changes for every update are getting silly, I think I'd
>> rather disable doxygen in those ports..
>>
>
> Other opinions or agreements?

Doxygen breaks very often on mips64, and AFAICT there's a good number
of ports that don't get built there because of that since 5.8.

I think Doxygen is mostly bloat, most people will look for their HTML
documentation online these days anyway,

I don't feel good having a dependency on a port which does this:

NOT_FOR_ARCHS= m88k sh
BROKEN-alpha= .got subsegment exceeds 64K

.if ${MACHINE_ARCH} == "mips64" ...
# ld(1) fails
CONFIGURE_ARGS+=-Denglish_only:Bool=ON
.endif

CVS: cvs.openbsd.org: ports

[Matthias Kilian]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/10/22 15:38:12

Modified files:
x11/agar/agar  : Makefile 

Log message:
Oops! forgot to bump revision.

CVS: cvs.openbsd.org: ports

[Matthias Kilian]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/10/22 15:37:07

Modified files:
x11/agar/agar  : Makefile 

Log message:
This needs audio/libsndfile.

ok, czarkoff@

CVS: cvs.openbsd.org: ports

[Dmitrij Czarkoff]

CVSROOT:/cvs
Module name:ports
Changes by: czark...@cvs.openbsd.org2016/10/22 14:55:05

Modified files:
mail/s-nail: Makefile distinfo 

Log message:
Update to s-nail-14.8.14

Re: [Update] net/gpodder 3.1.0 -> 3.9.1

[trondd]

Ping, anyone?

On Sun, October 9, 2016 12:33 pm, trondd wrote:
> Resubmitting after Alexandr put the work in to update a bunch of Python
> stuff.
>
> Been running on amd64 for about a month.  This updates MASTER_SITES to use
> GitHub, cleans up the patches for manpages, and take maintainer.
>
> Tim.
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/gpodder/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile  24 Nov 2015 09:11:05 -  1.9
> +++ Makefile  9 Oct 2016 16:12:36 -
> @@ -2,51 +2,51 @@
>
>  COMMENT= media aggregator and podcast client
>
> -MODPY_EGG_VERSION=   3.1.0
> +MODPY_EGG_VERSION=   3.9.1
>  DISTNAME=gpodder-${MODPY_EGG_VERSION}
> -REVISION=4
>  CATEGORIES=  net www
>
>  HOMEPAGE=http://gpodder.org/
>
> +MAINTAINER=  Tim Meunier 
> +
>  # GPLv3+
>  PERMIT_PACKAGE_CDROM=Yes
>
> -# upstream's master site doesn't play nice with ftp/DISTNAME, so just
> -# mirror the distfile instead.
> -MASTER_SITES=https://distfiles.nl/
> -
> -MODULES= devel/gettext \
> - lang/python \
> - textproc/intltool
> +GH_ACCOUNT=  gpodder
> +GH_PROJECT=  gpodder
> +GH_TAGNAME=  ${DISTNAME}
> +
> +MODULES= lang/python
>
> +BUILD_DEPENDS=   textproc/intltool
>  RUN_DEPENDS= devel/desktop-file-utils \
> - devel/py-minimock \
> + devel/gettext \
>   net/mygpoclient \
>   textproc/py-feedparser \
>   x11/dbus-python \
>   x11/gtk+3,-guic \
>   x11/py-gtk2
> -TEST_DEPENDS=devel/py-minimock \
> +TEST_DEPENDS=devel/py-minimock \
> + devel/py-coverage \
>   net/mygpoclient \
>   textproc/py-feedparser
>
>  USE_GMAKE=   Yes
>  MAKE_FILE=   makefile
> -MAKE_ENV=PYTHON=${MODPY_BIN}
> +MAKE_ENV=PYTHON=${MODPY_BIN} \
> + GPODDER_MANPATH_NO_SHARE="yes"
> +ALL_TARGET=  messages
>
>  TEST_TARGET= unittest
>
> -# Additional targets
> -post-build:
> - cd ${WRKSRC} && ${SETENV} -i ${MAKE_ENV} ${MAKE_PROGRAM} \
> - -f ${MAKE_FILE} messages
>
>  do-install:
> - cd ${WRKSRC} && ${SETENV} -i ${MAKE_ENV} ${MAKE_PROGRAM} \
> +
> + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
>   -f ${MAKE_FILE} install
> - # Move manpages to the right place..darn you setup.py
> - mv ${PREFIX}/share/man/man1/*.1 ${PREFIX}/man/man1/ && \
> - rm -fr ${PREFIX}/share/man
> +
> +post-install:
> + ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py
> ${PREFIX}/share/gpodder/extensions/
>
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/gpodder/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo  18 Jan 2015 03:14:39 -  1.2
> +++ distinfo  9 Oct 2016 16:12:36 -
> @@ -1,2 +1,2 @@
> -SHA256 (gpodder-3.1.0.tar.gz) =
> qyBpcxKfijjS/4CGmppP+BgiOVIvXlwWv1iRtHJsMv4=
> -SIZE (gpodder-3.1.0.tar.gz) = 2060222
> +SHA256 (gpodder-3.9.1.tar.gz) =
> zu0Fphh368dYcAwG8paODpMlYqAgWb8nmG+nEglGDbo=
> +SIZE (gpodder-3.9.1.tar.gz) = 1009899
> Index: patches/patch-makefile
> ===
> RCS file: /cvs/ports/net/gpodder/patches/patch-makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-makefile
> --- patches/patch-makefile20 Apr 2012 10:51:22 -  1.1.1.1
> +++ patches/patch-makefile9 Oct 2016 16:12:36 -
> @@ -1,12 +1,12 @@
>  $OpenBSD: patch-makefile,v 1.1.1.1 2012/04/20 10:51:22 jasper Exp $
>  makefile.origTue Mar 27 01:51:22 2012
> -+++ makefile Sun Apr  8 16:20:22 2012
> -@@ -84,7 +84,7 @@ $(GPODDER_DESKTOP_FILE_IN).h: $(GPODDER_DESKTOP_FILE_I
> +--- makefile.origWed Aug 31 15:10:41 2016
>  makefile Fri Sep 16 21:26:10 2016
> +@@ -82,7 +82,7 @@ $(GPODDER_SERVICE_FILE): $(GPODDER_SERVICE_FILE_IN)
>   intltool-extract --quiet --type=gettext/ini $<
>
> - install: messages $(GPODDER_SERVICE_FILE) $(GPODDER_DESKTOP_FILE)
> --$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PREFIX)
> -+$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=/${PREFIX}
> -
> -
> ##
> + install: messages $(GPODDER_SERVICE_FILE) $(DESKTOP_FILES)
> +-$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PREFIX)
> --optimize=1
> ++$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=/$(PREFIX)
> --optimize=1
>
> + release-win32:
> + $(MAKE) -C tools/win32-setup
> Index: patches/patch-setup_py
> 

CVS: cvs.openbsd.org: ports

[Alexandr Shadchin]

CVSROOT:/cvs
Module name:ports
Changes by: shadc...@cvs.openbsd.org2016/10/22 13:35:12

Modified files:
devel/py-simplejson: Makefile distinfo 
devel/py-simplejson/pkg: PLIST 

Log message:
Update to py-simplejson 3.9.0

CVS: cvs.openbsd.org: ports

[Alexandr Shadchin]

CVSROOT:/cvs
Module name:ports
Changes by: shadc...@cvs.openbsd.org2016/10/22 13:23:45

Modified files:
devel/py-setuptools_scm: Makefile distinfo 

Log message:
Update to py-setuptools_scm 1.15.0

Re: UPDATE: flake8, pep8 -> pycodestyle

[Alexandr Shadchin]

On Wed, Oct 19, 2016 at 11:04:12PM +0200, frantisek holop wrote:
> with the latest py-mccabe update, the current flake8
> stops working.
> 
> in other news pep8 has been renamed to pycodestyle and
> newer flake8 uses that instead.
> 
> so here's:
> - a port for pycodestyle (sorry, i can't do the
>   quirks song and dance)
> 
> - flake8 update to the latest.  8 tests fail but they
>   are all related to file paths of the build
>   infrastructure, and i don't have time to play with
>   this now...
> 
> please test and commit.
> 
> -f
> -- 
> 2 wrongs don't make a right - but 3 lefts do!

pycodestyle already was imported.

fix test for flake8. OK ?

-- 
Alexandr Shadchin

Index: Makefile
===
RCS file: /cvs/ports/devel/flake8/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile28 Dec 2015 17:28:20 -  1.5
+++ Makefile22 Oct 2016 19:02:59 -
@@ -2,7 +2,7 @@
 
 COMMENT =  modular python code checker wrapping pep8 and pyflakes
 
-MODPY_EGG_VERSION =2.5.1
+MODPY_EGG_VERSION =3.0.4
 DISTNAME = flake8-${MODPY_EGG_VERSION}
 
 CATEGORIES =   devel
@@ -21,14 +21,17 @@ MODULES =   lang/python
 MODPY_SETUPTOOLS = Yes
 
 TEST_DEPENDS = ${RUN_DEPENDS} \
-   devel/py-nose \
+   devel/py-test \
devel/py-mock
 
-RUN_DEPENDS =  devel/pep8 \
+RUN_DEPENDS =  devel/py-codestyle \
+   devel/py-configparser \
+   devel/py-enum34 \
devel/py-mccabe \
devel/pyflakes
 
 do-test:
-   cd ${WRKSRC} && ${LOCALBASE}/bin/nosetests --first-package-wins
+   touch ${WRKSRC}/tox.ini
+   cd ${WRKSRC} && PYTHONPATH=src ${MODPY_BIN} -m pytest tests
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/devel/flake8/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo28 Dec 2015 17:28:20 -  1.2
+++ distinfo22 Oct 2016 19:02:59 -
@@ -1,2 +1,2 @@
-SHA256 (flake8-2.5.1.tar.gz) = RIrtSLBnH+YGL0e5jDCB86Szb76Z3bisKjvm5ssTVgM=
-SIZE (flake8-2.5.1.tar.gz) = 83692
+SHA256 (flake8-3.0.4.tar.gz) = tMIQyZjwfW/yQyXdkfvAEfLDe81r9XaxiN4B2GVulw0=
+SIZE (flake8-3.0.4.tar.gz) = 1382588
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/devel/flake8/patches/patch-setup_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-setup_py
--- patches/patch-setup_py  28 Dec 2015 17:30:09 -  1.1
+++ patches/patch-setup_py  22 Oct 2016 19:02:59 -
@@ -1,14 +1,14 @@
 $OpenBSD: patch-setup_py,v 1.1 2015/12/28 17:30:09 jca Exp $
 Our version of pep8 1.6.2 is patched.
 https://mail.python.org/pipermail/code-quality/2015-March/000515.html
 setup.py.orig  Sun Oct 25 21:27:50 2015
-+++ setup.py   Thu Dec 24 05:47:55 2015
-@@ -50,7 +50,7 @@ setup(
- packages=["flake8", "flake8.tests"],
- install_requires=[
- "pyflakes >= 0.8.1, < 1.1",
--"pep8 >= 1.5.7, != 1.6.0, != 1.6.1, != 1.6.2",
-+"pep8 >= 1.5.7, != 1.6.0, != 1.6.1",
- "mccabe >= 0.2.1, < 0.4",
- ],
- entry_points={
+--- setup.py.orig  Fri Jul 29 18:20:27 2016
 setup.py   Sun Oct 23 00:02:08 2016
+@@ -15,7 +15,7 @@ import flake8
+ tests_require = ['mock', 'pytest']
+ 
+ requires = [
+-"pyflakes >= 0.8.1, != 1.2.0, != 1.2.1, != 1.2.2, < 1.3.0",
++"pyflakes >= 0.8.1, != 1.2.0, != 1.2.1, != 1.2.2, < 1.4.0",
+ "pycodestyle >= 2.0.0, < 2.1.0",
+ "mccabe >= 0.5.0, < 0.6.0",
+ ]
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/flake8/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   28 Dec 2015 17:28:20 -  1.2
+++ pkg/PLIST   22 Oct 2016 19:02:59 -
@@ -6,45 +6,72 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 
lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
 
lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
 
lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 
lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/flake8/__init__.py
 lib/python${MODPY_VERSION}/site-packages/flake8/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/flake8/__main__.py
 lib/python${MODPY_VERSION}/site-packages/flake8/__main__.pyc

CVS: cvs.openbsd.org: ports

[Alexandr Shadchin]

CVSROOT:/cvs
Module name:ports
Changes by: shadc...@cvs.openbsd.org2016/10/22 12:43:14

Modified files:
net/py-curl: Makefile distinfo 

Log message:
Update to py-curl 7.43.0

ok jca@

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/10/22 11:31:44

Modified files:
sysutils/ansible: Makefile 
sysutils/ansible/patches: 
  
patch-lib_ansible_modules_extras_packaging_os_openbsd_pkg_py 

Log message:
sync with upstream git master, fixes package installation issues

reported by semarie
ok danj@

Re: fix u-boot build on big endian hosts

[Jeremie Courreges-Anglas]

Jonathan Gray  writes:

> u-boot contains a static crc table with endian calls that essentially
> requires the endian calls to be macros.
>
> lib/crc32.c:87: error: braced-group within expression allowed only inside a 
> function
>
> Define the glibc names in u-boot compiler.h as at least some parts of
> the non-cross build assumes those names are present (ie crc32.c).
>
> The cross built parts use local definitions that set __BYTE_ORDER etc
> but it isn't always entirely clear which is which.

ok

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

Re: UPDATE: devel/doxygen

[Rafael Sadowski]

On Tue Sep 20, 2016 at 01:33:34AM +0100, Stuart Henderson wrote:
> These plist changes for every update are getting silly, I think I'd
> rather disable doxygen in those ports..
> 

Other opinions or agreements?

> 
> 
> On 2016/09/19 21:38, Rafael Sadowski wrote:
> > Hi ports@
> > 
> > updated again. Doxygen port changes:
> > 
> > - Switch to qt5
> > -- Build doxyapp, doxyindexer applications (Tested @amd64)
> > - Some patches are no longer needed (committed upstream)
> > - Take Maintainer
> > 
> > I checked all ports with doxygen usage:
> > 
> > devel/libmtpREVISION bump and updated plist
> > devel/qjson REVISION bump and updated plist
> > geo/geosREVISION bump and updated plist, switch 
> > HOMEPAGE to HTTPS
> > graphics/lensfunREVISION bump and updated plist
> > multimedia/libquicktime REVISION bump and updated plist
> > x11/dbusmenu-qt REVISION bump and updated plist
> > x11/ede/lib REVISION bump and updated plist
> > net/ortpREVISION bump and updated plist
> > 
> > databases/soprano   none plist changes
> > devel/kf5/kapidox   none plist changes
> > devel/libidnnone plist changes
> > devel/simulavr  none plist changes
> > devel/tclap none plist changes
> > graphics/digikam-kde4   none plist changes
> > graphics/opencv none plist changes
> > math/ginac  none plist changes
> > net/libktorrent none plist changes
> > net/libmygpo-qt none plist changes
> > productivity/kmymoney   none plist changes
> > productivity/libalkimia none plist changes
> > x11/awesome none plist changes
> > x11/gtk3mm  none plist changes
> > x11/kde4/nepomuk-core   none plist changes
> > x11/kde4/runtimenone plist changes
> > 
> > devel/cppunit/Makefile  disable-doxygen
> > devel/kyua-cli  without-doxygen
> > devel/kyua-testers  without-doxygen
> > devel/libhidw   without-doxygen
> > devel/rapidsvn  with-doxygen=no
> > graphics/geeqie disable-doxygen-doc
> > graphics/libpgf Force disabling documentation 
> > generation through doxygen
> > multimedia/libbluraydisable-doxygen-doc
> > multimedia/libv4l   disable-doxygen-doc
> > net/avahi   disable-doxygen-doc
> > net/meanwhile   enable-doxygen=no
> > net/pidgin  disable-doxygen
> > productivity/gnucashdisable-doxygen
> > sysutils/inotify-tools  disable-doxygen
> > x11/dbusdisable-doxygen-docs
> > x11/libxdg-basedir  disable-doxygen-doc
> > x11/xkbcommon   without-doxygen
> > 
> > Tested only on amd64. I am looking forward about your feedback and I hope we
> > will see 1.8.12 quickly in the tree.
> > 
> > Kind regards,
> > 
> > Rafael Sadowski
> > 
> > 
> > 
> > Index: devel/doxygen/Makefile
> > ===
> > RCS file: /cvs/ports/devel/doxygen/Makefile,v
> > retrieving revision 1.35
> > diff -u -p -u -p -r1.35 Makefile
> > --- devel/doxygen/Makefile  28 Apr 2016 17:55:27 -  1.35
> > +++ devel/doxygen/Makefile  18 Sep 2016 15:13:38 -
> > @@ -8,16 +8,17 @@ BROKEN-alpha= .got subsegment exceeds 64
> >  COMMENT-main=  source code documentation generator tool
> >  COMMENT-gui=   GUI front-end for doxygen
> >  
> > -VERSION=   1.8.11
> > +VERSION=   1.8.12
> >  DISTNAME=  doxygen-${VERSION}.src
> >  PKGNAME-main=  doxygen-${VERSION}
> >  FULLPKGNAME-gui=doxygen-gui-${VERSION}
> > -REVISION=  0
> >  
> >  CATEGORIES=devel textproc
> >  
> >  HOMEPAGE=  http://www.doxygen.org/
> >  
> > +MAINTAINER=Rafael Sadowski 
> > +
> >  # GPLv2
> >  PERMIT_PACKAGE_CDROM=  Yes
> >  
> > @@ -27,24 +28,27 @@ MASTER_SITES=   http://ftp.stack.nl/pub/us
> >  MULTI_PACKAGES=-main -gui
> >  PSEUDO_FLAVORS=no_gui bootstrap
> >  
> > -COMMON_WANTLIB=c m stdc++
> > -WANTLIB-main=  ${COMMON_WANTLIB} iconv pthread
> > -WANTLIB-gui=   ${COMMON_WANTLIB} QtCore QtGui QtXml
> > -
> > -COMMON_LIB_DEPENDS= converters/libiconv
> > -LIB_DEPENDS-main= ${COMMON_LIB_DEPENDS}
> > -LIB_DEPENDS-gui= ${COMMON_LIB_DEPENDS} ${MODQT_LIB_DEPENDS}
> > +COMMON_WANTLIB= c m pthread estdc++
> > +WANTLIB-main=  ${COMMON_WANTLIB} iconv z xapian
> > +WANTLIB-gui=   Qt5Core Qt5Gui Qt5Widgets Qt5Xml \
> > +   ${COMMON_WANTLIB}
> > +
> > +LIB_DEPENDS-main=  converters/libiconv \
> > +   databases/xapian-core
> > +
> > +LIB_DEPENDS-gui=   ${MODQT_LIB_DEPENDS}
> > +
> >  RUN_DEPENDS-gui= doxygen-${VERSION}:${BUILD_PKGPATH}
> 

Re: [NEW] devel/lua-tz

[Jeremie Courreges-Anglas]

Frederic Cambus  writes:

> Hi ports@,
>
> Here is a new port: devel/lua-tz
>
> Comments? OK?
>
> From DESCR:
>
> A lua library for time and date manipulation.
>
> Features include:
>
> - Normalisation of broken down date objects - allows for complex time/date
>   manipulation logic e.g. "What day is it in 2 days, 5 hours from now?"
> - Conversion between locations (time zones) using your local zoneinfo database
> - strftime style formatting

ok jca@

You could add a very basic test target, eg

do-test:
cd ${WRKSRC} && ${MODLUA_BIN} ${WRKSRC}/examples/os_date.lua

(the other example file doesn't work...)

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

Re: ansible: openbsd_pkg fails to run when just specifying the package name

[Daniel Jakots]

On Tue, 18 Oct 2016 20:13:27 +0200, Jasper Lievisse Adriaanse
 wrote:

> So this diff below is a sync with upstream devel as of right now

Please go ahead, it unbreaks ansible. ok danj@

Cheers,
Daniel

Re: [update] lang/rust 1.12.1

[Daniel Jakots]

On Fri, 21 Oct 2016 20:14:53 +0200, Sebastien Marie 
wrote:

> Hi,
> 
> Here an update for lang/rust.
> 
> For release note see
> https://blog.rust-lang.org/2016/10/20/Rust-1.12.1.html. For the full
> change see https://github.com/rust-lang/rust/pull/37173.
> 
> Please note I rebuilded the bootstrap due to bug in rustc: 1.12.0
> wasn't able to rebuild 1.12.1 without intrusive patch is build
> system. It should be corrected in next version of rustc, and I
> upgraded the Makefile to try rebuilding when major are same between
> bootstrap and version.
> 
> Diff tested with `make test', and by rebuilding devel/cargo.
> 
> Thanks.

Updated patch after a make update-patches.

ok danj@ if someone wants to commit it.

Cheers,
DanielIndex: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile	5 Oct 2016 16:48:10 -	1.30
+++ Makefile	22 Oct 2016 13:31:30 -
@@ -7,12 +7,12 @@ PKG_ARCH-doc =		*
 COMMENT-main =		compiler for Rust Language
 COMMENT-doc =		html documentation for rustc
 
-V =			1.12.0
-BV =			1.12.0-20160929
+V =			1.12.1
+BV =			1.12.1-20161021
 DISTNAME =		rustc-${V}-src
 
 #RUST_HASH !=		echo -n ${V} | md5 | cut -c1-8
-RUST_HASH =		40393716
+RUST_HASH =		5c6cf767
 SUBST_VARS +=		RUST_HASH
 
 PKGNAME =		rust-${V}
@@ -87,8 +87,8 @@ CONFIGURE_ARGS +=	--disable-valgrind-rpa
 			--prefix="${LOCALBASE}" \
 			--mandir="${LOCALBASE}/man"
 
-# VERSION and BOOTSTRAP are same version
-.if ${V} == ${BV:C/-[0-9]+$//}
+# VERSION and BOOTSTRAP are same major version
+.if ${V:C/\.[0-9]+$//} == ${BV:C/\.[0-9]+-[0-9]+$//}
 CONFIGURE_ARGS +=	--enable-local-rebuild
 .endif
 
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo	5 Oct 2016 16:48:10 -	1.17
+++ distinfo	22 Oct 2016 13:31:30 -
@@ -1,4 +1,4 @@
-SHA256 (rust/rustc-1.12.0-src.tar.gz) = rFkH1vqWwZvVkB2NmTg/uHVRJ1cerT1AcMzpwftfM3o=
-SHA256 (rust/rustc-bootstrap-amd64-1.12.0-20160929.tar.gz) = VjewvFzkgatD8nKLpLmaCtWkRecoNWDNOd3GrdYH42U=
-SIZE (rust/rustc-1.12.0-src.tar.gz) = 27501444
-SIZE (rust/rustc-bootstrap-amd64-1.12.0-20160929.tar.gz) = 24459997
+SHA256 (rust/rustc-1.12.1-src.tar.gz) = l5E65MslVhiqrNGlNLEfNDY0sECzJlYlDQnY2ewC09w=
+SHA256 (rust/rustc-bootstrap-amd64-1.12.1-20161021.tar.gz) = KNG9v6HBcpbf/rr2IaaPkHgjNQ1EwothEswHPdNV4mo=
+SIZE (rust/rustc-1.12.1-src.tar.gz) = 27511443
+SIZE (rust/rustc-bootstrap-amd64-1.12.1-20161021.tar.gz) = 25133752
Index: patches/patch-configure
===
RCS file: /cvs/ports/lang/rust/patches/patch-configure,v
retrieving revision 1.12
diff -u -p -r1.12 patch-configure
--- patches/patch-configure	3 Sep 2016 19:51:47 -	1.12
+++ patches/patch-configure	22 Oct 2016 13:31:30 -
@@ -1,9 +1,9 @@
 $OpenBSD: patch-configure,v 1.12 2016/09/03 19:51:47 naddy Exp $
 Remove requirement for curl.
 The snapshot isn't downloaded but copied by post-configure.
 configure.orig	Tue Aug 16 03:54:35 2016
-+++ configure	Sat Sep  3 13:35:30 2016
-@@ -726,7 +726,7 @@ if [ -n "$CFG_ENABLE_ORBIT" ]; then putvar CFG_ENABLE_
+--- configure.orig	Wed Oct 19 23:51:02 2016
 configure	Sat Oct 22 15:28:15 2016
+@@ -737,7 +737,7 @@ if [ -n "$CFG_DISABLE_ORBIT" ]; then putvar CFG_DISABL
  
  step_msg "looking for build programs"
  
@@ -12,7 +12,7 @@ The snapshot isn't downloaded but copied
  if [ -z "$CFG_PYTHON_PROVIDED" ]; then
  probe_need CFG_PYTHON  python2.7 python2 python
  fi
-@@ -877,7 +877,7 @@ then
+@@ -899,7 +899,7 @@ then
  fi
  
  CMD="${CFG_LOCAL_RUST_ROOT}/bin/rustc${BIN_SUF}"
Index: patches/patch-src_librustdoc_test_rs
===
RCS file: /cvs/ports/lang/rust/patches/patch-src_librustdoc_test_rs,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_librustdoc_test_rs
--- patches/patch-src_librustdoc_test_rs	31 Aug 2016 08:33:19 -	1.3
+++ patches/patch-src_librustdoc_test_rs	22 Oct 2016 13:31:30 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_librustdoc_test_rs,v 1.3 2016/08/31 08:33:19 landry Exp $
 fallback to CFG_PREFIX as default sysroot.
 src/librustdoc/test.rs.orig	Tue Aug 16 03:54:35 2016
-+++ src/librustdoc/test.rs	Fri Aug 19 06:40:11 2016
+--- src/librustdoc/test.rs.orig	Wed Oct 19 23:51:02 2016
 src/librustdoc/test.rs	Sat Oct 22 15:28:15 2016
 @@ -63,9 +63,16 @@ pub fn run(input: ,
  let input_path = PathBuf::from(input);
  let input = config::Input::File(input_path.clone());
@@ -21,9 +21,9 @@ fallback to CFG_PREFIX as default sysroo
  search_paths: libs.clone(),
  crate_types: vec!(config::CrateTypeDylib),
  externs: externs.clone(),
-@@ -187,9 +194,16 @@ fn runtest(test: , cratename: , cfgs: Vec { p.pop(); p.pop(); p }
Index: 

CVS: cvs.openbsd.org: ports

[Dmitrij Czarkoff]

CVSROOT:/cvs
Module name:ports
Changes by: czark...@cvs.openbsd.org2016/10/22 06:26:46

Modified files:
graphics/imv   : Makefile distinfo 

Log message:
update to imv-2.1.3

Re: UPDATE: security/keepassx

[Landry Breuil]

On Fri, Oct 21, 2016 at 09:51:24PM +0200, Rafael Sadowski wrote:
> *ping*
> 
> On Mon Oct 10, 2016 at 05:56:29PM +0200, Rafael Sadowski wrote:
> > Hi ports@, steven@,
> > 
> > as always,  here is the diff to update keepassx from 2.0.2 to 2.0.3.
> > Pretty simple! Tested on amd64 with *.kdbx (not *.kdb)

Works for me too on amd64 with a kdbx, and the WANTLIB fix is correct
too. ok to commit (steven?)

Landry

Re: Update for devel/dtc

[Jonathan Gray]

On Sat, Oct 22, 2016 at 09:51:04AM +0200, Daniel Melani wrote:
> On Fri, Oct 14, 2016 at 09:58:21PM +0200, Daniel Melani wrote:
> > On Fri, Oct 14, 2016 at 11:03:55PM +1100, Jonathan Gray wrote:
> > > On Fri, Oct 14, 2016 at 01:47:10PM +0200, Daniel Melani wrote:
> > > > On Fri, Oct 14, 2016 at 11:51:38AM +0100, Stuart Henderson wrote:
> > > > > On 2016/10/14 12:39, Daniel Melani wrote:
> > > > > > Hi,
> > > > > > 
> > > > > > Here's an update that brings devel/dtc up to the latest version.
> > > > > 
> > > > > Your diff is mangled.
> > > > > 
> > > > 
> > > > Sorry about that. Let me try that again with a sane email client.
> > > 
> > > It looks like SHARED_LIBS needs to change as well
> > 
> > Quite right. Thanks for catching this one. I looked through the changes
> > made in libfdt and it looked mostly like a few new features and better
> > error handling.
> > 
> > Here's an updated version of the patch.
> > 
> Any feedback on this?

I'm ok with this version going in.  Haven't encountered any problems
building u-boot or running fdtdump.

> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/devel/dtc/Makefile,v
> > retrieving revision 1.11
> > diff -u -p -u -p -r1.11 Makefile
> > --- Makefile19 Nov 2015 20:17:15 -  1.11
> > +++ Makefile14 Oct 2016 19:37:11 -
> > @@ -2,12 +2,12 @@
> >  
> >  COMMENT=   Device Tree Compiler
> >  
> > -DISTNAME=  dtc-1.4.1
> > +DISTNAME=  dtc-1.4.2
> >  CATEGORIES=sysutils devel
> >  MASTER_SITES=  http://www.kernel.org/pub/software/utils/dtc/
> >  EXTRACT_SUFX=  .tar.xz
> >  
> > -SHARED_LIBS=   fdt 1.1
> > +SHARED_LIBS=   fdt 1.2
> >  
> >  HOMEPAGE=  http://devicetree.org/Device_Tree_Compiler
> >  
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/devel/dtc/distinfo,v
> > retrieving revision 1.3
> > diff -u -p -u -p -r1.3 distinfo
> > --- distinfo3 Jun 2015 20:17:04 -   1.3
> > +++ distinfo14 Oct 2016 19:37:11 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (dtc-1.4.1.tar.xz) = d5kq2OrHto9VPQuljltRYErIA9EmGWyZ4644qq4ou5Q=
> > -SIZE (dtc-1.4.1.tar.xz) = 107920
> > +SHA256 (dtc-1.4.2.tar.xz) = E0Vu6YQKu7y5VtBxHFgNKFJOLuF4QOVW50QxHy2K+qw=
> > +SIZE (dtc-1.4.2.tar.xz) = 112480
> > Index: patches/patch-Makefile
> > ===
> > RCS file: /cvs/ports/devel/dtc/patches/patch-Makefile,v
> > retrieving revision 1.4
> > diff -u -p -u -p -r1.4 patch-Makefile
> > --- patches/patch-Makefile  3 Jun 2015 20:17:04 -   1.4
> > +++ patches/patch-Makefile  14 Oct 2016 19:37:11 -
> > @@ -1,29 +1,15 @@
> > -$OpenBSD: patch-Makefile,v 1.4 2015/06/03 20:17:04 uaa Exp $
> >  Makefile.orig  Tue Nov 11 22:29:16 2014
> > -+++ Makefile   Sun May 31 19:50:12 2015
> > -@@ -16,9 +16,9 @@ LOCAL_VERSION =
> > - CONFIG_LOCALVERSION =
> > - 
> > +--- Makefile.orig  Sat Sep  3 13:02:30 2016
> >  Makefile   Fri Oct 14 11:28:16 2016
> > +@@ -18,7 +18,7 @@
> >   CPPFLAGS = -I libfdt -I .
> > --WARNINGS = -Werror -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
> > --  -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow
> > + WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
> > +   -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow
> >  -CFLAGS = -g -Os -fPIC -Werror $(WARNINGS)
> > -+WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
> > -+  -Wstrict-prototypes -Wmissing-prototypes -Wshadow
> > -+CFLAGS += -fPIC $(WARNINGS)
> > ++CFLAGS = -g -Os -fPIC $(WARNINGS)
> >   
> >   BISON = bison
> >   LEX = flex
> > -@@ -38,7 +38,7 @@ SHAREDLIB_EXT=dylib
> > - SHAREDLIB_LINK_OPTIONS=-dynamiclib -Wl,-install_name -Wl,
> > - else
> > - SHAREDLIB_EXT=so
> > --SHAREDLIB_LINK_OPTIONS=-shared -Wl,--version-script=$(LIBFDT_version) 
> > -Wl,-soname,
> > -+SHAREDLIB_LINK_OPTIONS=-shared -Wl,--version-script=$(LIBFDT_version)
> > - endif
> > - 
> > - #
> > -@@ -134,7 +134,7 @@ endif
> > +@@ -134,7 +134,7 @@
> >   LIBFDT_objdir = libfdt
> >   LIBFDT_srcdir = libfdt
> >   LIBFDT_archive = $(LIBFDT_objdir)/libfdt.a
> > @@ -32,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.4 2015/06/0
> >   LIBFDT_include = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_INCLUDES))
> >   LIBFDT_version = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_VERSION))
> >   
> > -@@ -169,8 +169,6 @@ install-lib: all
> > +@@ -169,8 +169,6 @@
> > @$(VECHO) INSTALL-LIB
> > $(INSTALL) -d $(DESTDIR)$(LIBDIR)
> > $(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR)
> > @@ -41,7 +27,7 @@ $OpenBSD: patch-Makefile,v 1.4 2015/06/0
> > $(INSTALL) -m 644 $(LIBFDT_archive) $(DESTDIR)$(LIBDIR)
> >   
> >   install-includes:
> > -@@ -232,12 +230,12 @@ clean: libfdt_clean tests_clean
> > +@@ -248,12 +246,12 @@
> >   # Generic compile rules
> >   #
> >   %: 

Re: Update for devel/dtc

[Daniel Melani]

On Fri, Oct 14, 2016 at 09:58:21PM +0200, Daniel Melani wrote:
> On Fri, Oct 14, 2016 at 11:03:55PM +1100, Jonathan Gray wrote:
> > On Fri, Oct 14, 2016 at 01:47:10PM +0200, Daniel Melani wrote:
> > > On Fri, Oct 14, 2016 at 11:51:38AM +0100, Stuart Henderson wrote:
> > > > On 2016/10/14 12:39, Daniel Melani wrote:
> > > > > Hi,
> > > > > 
> > > > > Here's an update that brings devel/dtc up to the latest version.
> > > > 
> > > > Your diff is mangled.
> > > > 
> > > 
> > > Sorry about that. Let me try that again with a sane email client.
> > 
> > It looks like SHARED_LIBS needs to change as well
> 
> Quite right. Thanks for catching this one. I looked through the changes
> made in libfdt and it looked mostly like a few new features and better
> error handling.
> 
> Here's an updated version of the patch.
> 
Any feedback on this?
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/dtc/Makefile,v
> retrieving revision 1.11
> diff -u -p -u -p -r1.11 Makefile
> --- Makefile  19 Nov 2015 20:17:15 -  1.11
> +++ Makefile  14 Oct 2016 19:37:11 -
> @@ -2,12 +2,12 @@
>  
>  COMMENT= Device Tree Compiler
>  
> -DISTNAME=dtc-1.4.1
> +DISTNAME=dtc-1.4.2
>  CATEGORIES=  sysutils devel
>  MASTER_SITES=http://www.kernel.org/pub/software/utils/dtc/
>  EXTRACT_SUFX=.tar.xz
>  
> -SHARED_LIBS= fdt 1.1
> +SHARED_LIBS= fdt 1.2
>  
>  HOMEPAGE=http://devicetree.org/Device_Tree_Compiler
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/dtc/distinfo,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 distinfo
> --- distinfo  3 Jun 2015 20:17:04 -   1.3
> +++ distinfo  14 Oct 2016 19:37:11 -
> @@ -1,2 +1,2 @@
> -SHA256 (dtc-1.4.1.tar.xz) = d5kq2OrHto9VPQuljltRYErIA9EmGWyZ4644qq4ou5Q=
> -SIZE (dtc-1.4.1.tar.xz) = 107920
> +SHA256 (dtc-1.4.2.tar.xz) = E0Vu6YQKu7y5VtBxHFgNKFJOLuF4QOVW50QxHy2K+qw=
> +SIZE (dtc-1.4.2.tar.xz) = 112480
> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/devel/dtc/patches/patch-Makefile,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 patch-Makefile
> --- patches/patch-Makefile3 Jun 2015 20:17:04 -   1.4
> +++ patches/patch-Makefile14 Oct 2016 19:37:11 -
> @@ -1,29 +1,15 @@
> -$OpenBSD: patch-Makefile,v 1.4 2015/06/03 20:17:04 uaa Exp $
>  Makefile.origTue Nov 11 22:29:16 2014
> -+++ Makefile Sun May 31 19:50:12 2015
> -@@ -16,9 +16,9 @@ LOCAL_VERSION =
> - CONFIG_LOCALVERSION =
> - 
> +--- Makefile.origSat Sep  3 13:02:30 2016
>  Makefile Fri Oct 14 11:28:16 2016
> +@@ -18,7 +18,7 @@
>   CPPFLAGS = -I libfdt -I .
> --WARNINGS = -Werror -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
> ---Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow
> + WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
> + -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow
>  -CFLAGS = -g -Os -fPIC -Werror $(WARNINGS)
> -+WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
> -+-Wstrict-prototypes -Wmissing-prototypes -Wshadow
> -+CFLAGS += -fPIC $(WARNINGS)
> ++CFLAGS = -g -Os -fPIC $(WARNINGS)
>   
>   BISON = bison
>   LEX = flex
> -@@ -38,7 +38,7 @@ SHAREDLIB_EXT=dylib
> - SHAREDLIB_LINK_OPTIONS=-dynamiclib -Wl,-install_name -Wl,
> - else
> - SHAREDLIB_EXT=so
> --SHAREDLIB_LINK_OPTIONS=-shared -Wl,--version-script=$(LIBFDT_version) 
> -Wl,-soname,
> -+SHAREDLIB_LINK_OPTIONS=-shared -Wl,--version-script=$(LIBFDT_version)
> - endif
> - 
> - #
> -@@ -134,7 +134,7 @@ endif
> +@@ -134,7 +134,7 @@
>   LIBFDT_objdir = libfdt
>   LIBFDT_srcdir = libfdt
>   LIBFDT_archive = $(LIBFDT_objdir)/libfdt.a
> @@ -32,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.4 2015/06/0
>   LIBFDT_include = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_INCLUDES))
>   LIBFDT_version = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_VERSION))
>   
> -@@ -169,8 +169,6 @@ install-lib: all
> +@@ -169,8 +169,6 @@
>   @$(VECHO) INSTALL-LIB
>   $(INSTALL) -d $(DESTDIR)$(LIBDIR)
>   $(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR)
> @@ -41,7 +27,7 @@ $OpenBSD: patch-Makefile,v 1.4 2015/06/0
>   $(INSTALL) -m 644 $(LIBFDT_archive) $(DESTDIR)$(LIBDIR)
>   
>   install-includes:
> -@@ -232,12 +230,12 @@ clean: libfdt_clean tests_clean
> +@@ -248,12 +246,12 @@
>   # Generic compile rules
>   #
>   %: %.o
> @@ -56,7 +42,7 @@ $OpenBSD: patch-Makefile,v 1.4 2015/06/0
>   
>   %.o: %.S
>   @$(VECHO) AS $@
> -@@ -265,7 +263,7 @@ clean: libfdt_clean tests_clean
> +@@ -281,7 +279,7 @@
>   
>   $(LIBFDT_lib):
>   @$(VECHO) LD $@
> Index: patches/patch-tests_Makefile_tests
> ===
> RCS file: /cvs/ports/devel/dtc/patches/patch-tests_Makefile_tests,v
> retrieving