new devel/p5-Importer

[Alexander Bluhm]

Hi,

ok for new p5-Importer-0.024 ?

Comment:
alternative but compatible interface to modules that export

Description:
This module acts as a layer between Exporter and modules which
consume exports.  It is feature-compatible with Exporter, plus some
much needed extras.  You can use this to import symbols from any
exporter that follows Exporters specification.  The exporter modules
themselves do not need to use or inherit from the Exporter module,
they just need to set @EXPORT and/or other variables.

bluhm


p5-Importer.tgz
Description: application/tar-gz

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2017/10/29 16:27:52

Modified files:
security/p5-IO-Socket-SSL: Makefile distinfo 

Log message:
update p5-IO-Socket-SSL to 2.052

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2017/10/29 15:49:16

Modified files:
misc/p5-File-LibMagic: Makefile distinfo 
Added files:
misc/p5-File-LibMagic/patches: patch-MANIFEST 

Log message:
update p5-File-LibMagic to 1.16
use build dependency instead of included modules

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2017/10/29 15:39:00

ports/misc/p5-File-LibMagic/patches

Update of /cvs/ports/misc/p5-File-LibMagic/patches
In directory cvs.openbsd.org:/tmp/cvs-serv30049/patches

Log Message:
Directory /cvs/ports/misc/p5-File-LibMagic/patches added to the repository

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/10/29 15:34:52

Modified files:
mail/mutt  : Makefile 
mail/mutt/pkg  : PLIST 

Log message:
remove stray / in @pkgpath

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2017/10/29 15:09:49

Modified files:
textproc/p5-XML-LibXML: Makefile distinfo 
textproc/p5-XML-LibXML/patches: patch-Makefile_PL 

Log message:
update p5-XML-LibXML to 2.0132

UPDATE: graphics/opencv

[Rafael Sadowski]

Hi All,

Update OpenCV to the latest stable version 2.4.13.4.

Notable port changes:
- HOMEPAGE switch to https
- MAINTAINER email address
- Regen WANTLIB-main
- More portable cmake changes in patch-modules_java_CMakeLists_txt

Ok? Comments?

Best regards,

Rafael


Index: Makefile
===
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.42
diff -u -p -u -p -r1.42 Makefile
--- Makefile26 Jul 2017 22:45:24 -  1.42
+++ Makefile29 Oct 2017 20:58:07 -
@@ -7,7 +7,7 @@ COMMENT-docs =  OpenCV documentation and
 COMMENT-main = library of programming functions for real time cv
 COMMENT-java = Java bindings for OpenCV
 
-V =2.4.13
+V =2.4.13.4
 GH_ACCOUNT =   Itseez
 GH_PROJECT =   opencv
 GH_TAGNAME =   ${V}
@@ -15,19 +15,16 @@ GH_TAGNAME =${V}
 PKGNAME-main = ${PKGNAME}
 PKGNAME-docs = opencv-docs-$V
 PKGNAME-java = opencv-java-$V
-REVISION-docs =0
-REVISION-java =0
-REVISION-main =0
 
 .for i in opencv_calib3d opencv_contrib opencv_core opencv_features2d \
   opencv_flann opencv_gpu opencv_highgui opencv_imgproc opencv_legacy \
   opencv_ml opencv_nonfree opencv_objdetect opencv_photo opencv_stitching \
   opencv_superres opencv_ts opencv_video opencv_videostab opencv_ocl
-SHARED_LIBS += $i 2.0
+SHARED_LIBS += $i 3.0
 .endfor
 
-HOMEPAGE = http://www.opencv.org/
-MAINTAINER =   Rafael Sadowski 
+HOMEPAGE = https://www.opencv.org/
+MAINTAINER =   Rafael Sadowski 
 
 # "patents" means containing some patented algorithms, see
 # http://docs.opencv.org/modules/nonfree/doc/nonfree.html
@@ -39,14 +36,15 @@ PERMIT_PACKAGE_CDROM =  patents
 PERMIT_PACKAGE_CDROM-docs =Yes
 
 WANTLIB-main += ${MODPY_WANTLIB}
-WANTLIB-main += Half Iex IlmImf IlmThread Imath X11 Xcomposite Xcursor
-WANTLIB-main += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
-WANTLIB-main += avcodec avformat avresample avutil bz2 c cairo fontconfig
+WANTLIB-main += ${COMPILER_LIBCXX} Half Iex IlmImf IlmThread Imath
+WANTLIB-main += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB-main += Xrandr Xrender atk-1.0 avresample c cairo fontconfig
 WANTLIB-main += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
 WANTLIB-main += gobject-2.0 gstapp-1.0 gstbase-1.0 gstpbutils-1.0 gstreamer-1.0
 WANTLIB-main += gstriff-1.0 gstvideo-1.0 gthread-2.0 gtk-x11-2.0 intl
 WANTLIB-main += jasper jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB-main += png pthread ${COMPILER_LIBCXX} swscale tiff z
+WANTLIB-main += png tiff z
+
 
 WANTLIB-docs =
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/opencv/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo29 Nov 2016 00:27:23 -  1.6
+++ distinfo29 Oct 2017 20:58:07 -
@@ -1,2 +1,2 @@
-SHA256 (opencv-2.4.13.tar.gz) = lOvMphwwA01fsW/quOwSyKho9RYtIKnwOW8PX22Lu/8=
-SIZE (opencv-2.4.13.tar.gz) = 91669572
+SHA256 (opencv-2.4.13.4.tar.gz) = +Kvx/MLaO7HerId28HuDkPhxNy4qRNw1XHZd03kZRIE=
+SIZE (opencv-2.4.13.4.tar.gz) = 91833056
Index: patches/patch-cmake_OpenCVDetectPython_cmake
===
RCS file: patches/patch-cmake_OpenCVDetectPython_cmake
diff -N patches/patch-cmake_OpenCVDetectPython_cmake
--- patches/patch-cmake_OpenCVDetectPython_cmake29 Nov 2016 00:27:23 
-  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-cmake_OpenCVDetectPython_cmake,v 1.2 2016/11/29 00:27:23 sthen 
Exp $
 cmake/OpenCVDetectPython.cmake.origWed Apr 20 16:21:19 2016
-+++ cmake/OpenCVDetectPython.cmake Mon Jun  6 23:06:38 2016
-@@ -123,8 +123,8 @@ if(PYTHON_EXECUTABLE)
- find_host_program(SPHINX_BUILD sphinx-build)
- if(SPHINX_BUILD)
- execute_process(COMMAND "${SPHINX_BUILD}"
--OUTPUT_QUIET
--ERROR_VARIABLE SPHINX_OUTPUT
-+OUTPUT_VARIABLE SPHINX_OUTPUT
-+ERROR_QUIET
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(SPHINX_OUTPUT MATCHES "Sphinx v([0-9][^ \n]*)")
-   set(SPHINX_VERSION "${CMAKE_MATCH_1}")
Index: patches/patch-cmake_OpenCVPCHSupport_cmake
===
RCS file: 
/cvs/ports/graphics/opencv/patches/patch-cmake_OpenCVPCHSupport_cmake,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-cmake_OpenCVPCHSupport_cmake
--- patches/patch-cmake_OpenCVPCHSupport_cmake  21 Oct 2013 22:46:27 -  
1.1
+++ patches/patch-cmake_OpenCVPCHSupport_cmake  29 Oct 2017 20:58:07 -
@@ -1,12 +1,17 @@
 $OpenBSD: 

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2017/10/29 15:04:37

Modified files:
net/tcpdpriv/patches: patch-tcpdpriv_c 

Log message:
Stop including net/slip.h, proposed for removal

The code has a fallback #define for SLIP_HDRLEN.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2017/10/29 13:51:31

Modified files:
mail/neomutt   : Makefile distinfo 
mail/neomutt/patches: patch-main_c patch-newsrc_c 

Log message:
update to neomutt-20171027

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2017/10/29 12:44:40

Modified files:
x11/xfce4/xfce4-genmon: Makefile distinfo 

Log message:
Update to xfce4-genmon 4.0.1.

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2017/10/29 11:56:04

Modified files:
devel/keystone : Makefile 

Log message:
Missing bdep on python

Spotted by rpe@

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2017/10/29 11:31:41

Modified files:
devel/astyle   : Makefile distinfo 
devel/astyle/pkg: PLIST 
Added files:
devel/astyle/patches: patch-build_clang_Makefile 
Removed files:
devel/astyle/patches: patch-Makefile patch-astyle_main_cpp 

Log message:
Long overdue update to astyle-3.0.1, and take MAINTAINER.
ok fcambus@

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2017/10/29 11:27:49

Modified files:
games  : Makefile 

Log message:
+cataclysm-dda

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2017/10/29 11:27:19

Log message:
Import games/cataclysm-dda, a rogue-like zombie survival game.
Submitted by Tim Meunier , who takes
MAINTAINER.
ok and help and guidance sthen@

Cataclysm: Dark Days Ahead is a roguelike set in a post-apocalyptic
world.  Surviving is difficult: you have been thrown, ill-equipped, into
a landscape now riddled with monstrosities of which flesh eating zombies
are neither the strangest nor the deadliest.  Yet with care and a little
luck, many things are possible. You may try to eke out an existence in
the forests silently executing threats and providing sustenance with
your longbow. You can ride into town in a jerry-rigged vehicle, all guns
blazing, to settle matters in a fug of smoke from your molotovs. You
could take a more measured approach and construct an impregnable
fortress, surrounded by traps to protect you from the horrors without.
The longer you survive, the more skilled and adapted you will get and
the better equipped and armed to deal with the threats you are presented
with.  In the course of your ordeal there will be opportunities and
temptations to improve or change your very nature. There are tales of
survivors fitted with extraordinary cybernetics giving great power and
stories too of gravely mutated survivors who, warped by their ingestion
of exotic substances or radiation, now more closely resemble insects,
birds or fish than their original form.

Status:

Vendor Tag: bcallah
Release Tags:   bcallah_20171029

N ports/games/cataclysm-dda/Makefile
N ports/games/cataclysm-dda/distinfo
N ports/games/cataclysm-dda/patches/patch-Makefile
N ports/games/cataclysm-dda/pkg/PLIST
N ports/games/cataclysm-dda/pkg/DESCR
N ports/games/cataclysm-dda/pkg/PFRAG.no_x11
N ports/games/cataclysm-dda/pkg/PFRAG.no-no_x11

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2017/10/29 10:30:22

Modified files:
x11/xfce4/xfce4-pulseaudio: Makefile distinfo 

Log message:
Update to xfce4-pulseaudio 0.3.2.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/10/29 09:58:52

Modified files:
x11/gtk+3  : Makefile distinfo 

Log message:
Update to gtk+3-3.22.25.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/10/29 09:27:02

Modified files:
mail/gmime30   : Makefile distinfo 
mail/gmime30/pkg: PLIST 

Log message:
Update to gmime30-3.0.3.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/10/29 09:23:12

Modified files:
x11/gnome/librsvg: Makefile 
x11/gnome/librsvg/pkg: PLIST 

Log message:
Re-add the vala bindings now that we are skipping valadoc(1) in
lang/vala.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/10/29 09:17:36

Modified files:
lang/vala  : Makefile 
Added files:
lang/vala/patches: patch-Makefile_in patch-configure_ac 
Removed files:
lang/vala/pkg  : PLIST-valadoc 

Log message:
Patch out valadoc for the time being; it introduces lots of cyclic deps.
We'll revisit it at p2k17 and probably create subpackages with a bootstrap
FLAVOR in math/graphviz.

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2017/10/29 08:36:53

Modified files:
www/chromium   : Makefile 
www/chromium/patches: patch-base_sys_info_openbsd_cc 

Log message:
unbreak chromium by re-adding a lost pledge(2) patch from the update

[update] gdal 2.2.2, add python3 flavor

[Landry Breuil]

Hi,

another smalle update, and while here i tried adding a python3 flavor so
that i can have py3-gdal installable alongside py-gdal. the -main and
-perl subpackages are identical whether we use python2 or python3.
FULLPKGNAME/FULLPKGPATH needs to be defined now, i hope i didnt miss
something obvious.

While here, fixed the way openjpeg2 was detected, it could only work by
accident right now..

Comments on the way FLAVOR/MULTI_PACKAGES are handled are more than
welcome :)

Landry
? gdal-2.0.1-libgdal.so.23.0
? gdal-2.0.2-libgdal.so.24.0
? gdal-2.1.0-libgdal.so.25.0
? gdal-2.1.1-libgdal.so.26.0
? gdal-2.1.2-libgdal.so.26.0
? gdal-2.1.3-libgdal.so.27.0
? gdal-2.1.3-libgdal.so.28.0
? gdal-2.2.0-libgdal.so.29.0
? gdal-2.2.2-libgdal.so.29.0
? patch-port_cpl_port_h
? test-2.1.0.log
? test-2.1.1.log
? test-2.1.2.log
? test-2.1.2_2.log
? test-2.1.3.log
? test-2.2.0.log
? test-2.2.0_2.log
? test-2.2.1.log
Index: Makefile
===
RCS file: /cvs/ports/geo/gdal/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- Makefile26 Jul 2017 22:45:22 -  1.60
+++ Makefile29 Oct 2017 11:33:04 -
@@ -4,19 +4,19 @@
 COMMENT-python =python bindings and utilities for GDAL
 COMMENT-perl = perl bindings for GDAL
 
-V =2.2.1
+V =2.2.2
 DISTNAME = gdal-${V}
 DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
gdalautotest-${V}${EXTRACT_SUFX}
 
-PKGNAME-main = ${DISTNAME}
-PKGNAME-python =py-${DISTNAME}
-PKGNAME-perl = p5-Geo-GDAL-${V}
-REVISION-main =0
-REVISION-perl =0
-REVISION-python =  0
+FULLPKGNAME-main = ${DISTNAME}
+FULLPKGPATH-main = geo/gdal,-main
+FULLPKGNAME-python =   py-${DISTNAME}
+FULLPKGPATH-python =   geo/gdal,-python${FLAVOR_EXT:S/-/,/g}
+FULLPKGNAME-perl = p5-Geo-GDAL-${V}
+FULLPKGPATH-perl = geo/gdal,-perl
 
-SHARED_LIBS =  gdal 29.0 #22.0
+SHARED_LIBS =  gdal 30.0 #22.0
 CATEGORIES =   geo devel
 
 HOMEPAGE = http://www.gdal.org/
@@ -29,6 +29,12 @@
 MASTER_SITES = http://download.osgeo.org/gdal/${V}/
 
 MODULES =  perl lang/python devel/gettext
+FLAVORS =  python3
+FLAVOR ?=
+
+.if ${FLAVOR:Mpython3}
+FULLPKGNAME-python =   py3-${DISTNAME}
+.endif
 
 MULTI_PACKAGES =   -main -python -perl
 
@@ -56,10 +62,10 @@
proj pthread freexl pcre spatialite sqlite3 xml2 lzma 
nghttp2 webp
 
 
-LIB_DEPENDS-python =   ${PKGNAME}:${BASE_PKGPATH},-main
+LIB_DEPENDS-python =   ${FULLPKGNAME-main}:${FULLPKGPATH-main}
 WANTLIB-python =   ${MODPY_WANTLIB} gdal m pthread ${COMPILER_LIBCXX}
 
-LIB_DEPENDS-perl = ${PKGNAME}:${BASE_PKGPATH},-main
+LIB_DEPENDS-perl = ${FULLPKGNAME-main}:${FULLPKGPATH-main}
 WANTLIB-perl = perl gdal # uses perl ABI
 WANTLIB-perl += c crypto curl expat freexl geos_c geotiff gif iconv
 WANTLIB-perl += jasper jpeg json-c lzma m nghttp2 openjp2 pcre png
@@ -69,7 +75,7 @@
 RUN_DEPENDS += math/py-numpy
 BUILD_DEPENDS +=   ${RUN_DEPENDS} devel/swig
 
-TEST_DEPENDS +=${PKGNAME-python}:${BASE_PKGPATH},-python
+TEST_DEPENDS +=${FULLPKGNAME-python}:${FULLPKGPATH-python}
 TEST_ENV = GDAL_DOWNLOAD_TEST_DATA=1 GDAL_RUN_SLOW_TESTS=yes
 
 MODPY_SETUPTOOLS = Yes
@@ -98,7 +104,7 @@
--without-php \
--without-ruby \
--with-pg=${LOCALBASE}/bin/pg_config \
-   --with-python \
+   --with-python=${MODPY_BIN} \
--with-perl \
--with-geos \
--with-gnm \
@@ -115,6 +121,21 @@
 
 post-extract:
ln -sf ${WRKDIR}/gdalautotest-${V} ${WRKSRC}/autotest
+
+PYBINS = epsg_tr esri2wkt gcps2vec gcps2wld gdal2xyz gdal_auth gdal_merge \
+   gdalchksum gdalident gdalimport mkgraticule
+PYBINSWITHMAN = gdal2tiles gdal_calc gdal_edit gdal_fillnodata gdal_pansharpen 
\
+   gdal_polygonize gdal_proximity gdal_retile gdal_sieve gdalcompare \
+   gdalmove ogrmerge pct2rgb rgb2pct
+
+post-install:
+.for b in ${PYBINSWITHMAN}
+   mv -f ${PREFIX}/bin/$b.py ${PREFIX}/bin/$b${MODPY_BIN_SUFFIX}.py
+   mv -f ${PREFIX}/man/man1/$b.1 ${PREFIX}/man/man1/$b${MODPY_BIN_SUFFIX}.1
+.endfor
+.for b in ${PYBINS}
+   mv -f ${PREFIX}/bin/$b.py ${PREFIX}/bin/$b${MODPY_BIN_SUFFIX}.py
+.endfor
 
 do-test:
cd ${WRKSRC}/autotest && env ${TEST_ENV} ${MODPY_BIN} run_all.py
Index: distinfo
===
RCS file: /cvs/ports/geo/gdal/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- distinfo3 Jul 2017 18:45:31 -   1.21
+++ distinfo29 Oct 2017 11:33:04 -
@@ -1,4 +1,4 @@
-SHA256 (gdal-2.2.1.tar.gz) = YYN3Bqv6Pkk/NVAjbvwsFL1rJGUCMvkQfbUKlEq/iy8=
-SHA256 (gdalautotest-2.2.1.tar.gz) = 
wO5ztfYzbe+SMFsKNQNR4p2v4+j5+9BgckPup377Qqs=
-SIZE (gdal-2.2.1.tar.gz) = 13724990
-SIZE (gdalautotest-2.2.1.tar.gz) = 6768458
+SHA256 (gdal-2.2.2.tar.gz) = 

[update] qwt 6.3.1

[Landry Breuil]

Hi,

same thing, needed for qgis3 otherwise there's a missing header. Added
the Qt5 FLAVOR, + a hack to ensure CXXFLQGS (and thus -std=c++11) was
passed to all build lines, inlcuding the ones where dependencies are
generated.

I know vadim had a WIP on github (here
https://github.com/jasperla/openbsd-wip/tree/master/x11/qwt) that failed
with qgis at the time, but it seems the current 2.18 branch is happy
with qwt6 so far  Only other consumers are x11/kde4/plasma-addons and
x11/kde4/smokeqt.

I ditched the convoluted bits that installed examples while here.

oks/feedback welcome.
? patches/patch-qwt_pro
Index: Makefile
===
RCS file: /cvs/ports/x11/qwt/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile26 Jul 2017 22:45:34 -  1.23
+++ Makefile29 Oct 2017 11:32:46 -
@@ -1,11 +1,10 @@
 # $OpenBSD: Makefile,v 1.23 2017/07/26 22:45:34 sthen Exp $
 
 COMMENT =  Qt Widgets for Technical Applications
-DISTNAME = qwt-5.2.1
-SHARED_LIBS =  qwt 6.0
+DISTNAME = qwt-6.1.3
+SHARED_LIBS =  qwt 7.0
 CATEGORIES =   x11
 EXTRACT_SUFX = .tar.bz2
-REVISION = 6
 
 HOMEPAGE = http://qwt.sourceforge.net/
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=qwt/}
@@ -14,37 +13,43 @@
 # http://qwt.sourceforge.net/qwtlicense.html
 PERMIT_PACKAGE_CDROM = Yes
 
-MODULES =  devel/qmake x11/qt4
+MODULES =  devel/qmake
 MODQMAKE_INSTALL_ROOT =
 NO_TEST =  Yes
 USE_GMAKE =Yes
 
-WANTLIB += ICE QtDesigner QtGui QtScript QtXml SM X11 Xext Xi
-WANTLIB += Xinerama Xrender fontconfig freetype m pthread 
${COMPILER_LIBCXX}
+FLAVORS =  qt5
+FLAVOR ?=
 
-# svgmap example not included to prevent the need of svg dependencies
-EXAMPLES = bode realtime_plot cpuplot dials radio event_filter \
-   data_plot sliders histogram spectrogram sysinfo \
-   curvdemo1 curvdemo2 simple_plot
+.if ${FLAVOR:Mqt5}
+COMPILER = base-clang ports-clang ports-gcc
+#CXXFLAGS=-std=c++11
+MODULES += x11/qt5
+QTVER =qt5
+LIB_DEPENDS += x11/qt5/qtsvg \
+   x11/qt5/qttools
+WANTLIB += GL Qt5Concurrent Qt5Core Qt5Designer Qt5Gui Qt5OpenGL
+WANTLIB += Qt5PrintSupport Qt5Svg Qt5Widgets Qt5Xml
+.else
+MODULES += x11/qt4
+QTVER =qt4
+WANTLIB += GL ICE QtDesigner QtGui QtOpenGL QtScript QtSvg QtXml SM X11 
Xext Xi
+WANTLIB += Xinerama Xrender fontconfig freetype pthread
+.endif
 
-SUBST_VARS =   WRKINST EXAMPLES
+WANTLIB += ${COMPILER_LIBCXX} m
+
+SUBST_VARS =   WRKINST QTVER
 
 pre-configure:
-   @${SUBST_CMD} ${WRKSRC}/qwtconfig.pri ${WRKSRC}/designer/designer.pro \
-   ${WRKSRC}/examples/examples.pri
+   ${SUBST_CMD} ${WRKSRC}/qwtconfig.pri
+
+post-configure:
+.if ${FLAVOR:Mqt5}
+   sed -i -e 's/@$$(CXX) -M/@$$(CXX) $$(CXXFLAGS) -M/' 
${WRKSRC}/build-amd64/{src,designer}/Makefile
+.endif
 
 post-install:
-   ${INSTALL_MAN} ${WRKSRC}/doc/man/man3/* ${PREFIX}/man/man3/
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/qwt
-   ${SUBST_DATA} ${FILESDIR}/Makefile.examples \
-   ${PREFIX}/share/examples/qwt/Makefile
-   ${INSTALL_DATA} ${WRKSRC}/examples/examples.pri \
-   ${PREFIX}/share/examples/qwt/
-
-.for i in ${EXAMPLES}
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/qwt/${i}
-   ${INSTALL_DATA} ${WRKSRC}/examples/${i}/* \
-   ${PREFIX}/share/examples/qwt/${i}/
-.endfor
+   mv ${PREFIX}/share/doc/qwt/man/man3 ${PREFIX}/man/
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/qwt/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo18 Jan 2015 03:16:00 -  1.3
+++ distinfo29 Oct 2017 11:32:46 -
@@ -1,2 +1,2 @@
-SHA256 (qwt-5.2.1.tar.bz2) = 4ri7dVQEyz3JnmHz4tcmIVIZNIj1++iFJOtpjhGsVp8=
-SIZE (qwt-5.2.1.tar.bz2) = 1926453
+SHA256 (qwt-6.1.3.tar.bz2) = 8+zTTnKporCEIvtsjpCcp29M5fp3rK16KIO3AfQwlzM=
+SIZE (qwt-6.1.3.tar.bz2) = 4245614
Index: files/Makefile.examples
===
RCS file: files/Makefile.examples
diff -N files/Makefile.examples
--- files/Makefile.examples 7 Nov 2010 00:26:13 -   1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,20 +0,0 @@
-# $OpenBSD: Makefile.examples,v 1.2 2010/11/07 00:26:13 merdely Exp $
-
-EX_LIST=   ${EXAMPLES}
-
-all:
-   @for I in ${EX_LIST}; \
- do (cd $$I; echo "==> Building for $$I"; \
-   qmake4 $$I.pro && env LOCALBASE=${LOCALBASE} gmake; \
-echo "";); \
-   done
-
-clean:
-   @for I in ${EX_LIST}; \
- do (cd $$I; echo "==> Cleaning for $$I"; \
-   gmake distclean; \
-   rm -Rf obj; \
-   rm -Rf moc; \
-   echo "";); \
-   done
-
Index: 

[update] qscintilla/py-qscintilla 2.10.1

[Landry Breuil]

Hi,

i embarqued on the journey of testing the upcoming QGIS3 release, which
will require python3 and qt5 - and thus all of its dependencies should
work with those versions.

here's a first pair of diffs for qscintilla and py-qscintilla - while
here i've updated them to 2.10.1. Of course adding a qt5 FLAVOR, and
adapt the PLIST so that it works for both versions (which shouldnt
conflict). the qscintilla libname changes from libqsctinilla2 to
libqscintilla2_qt4/qt5, and thus all consumers needs fixing.
I also had t ochange the dir where SIP Qsci files are installed,
consumers should still pick'em.

I have those diffs in a bulk to build-test them:
devel/hgview (needs an update ?)
geo/qgis (2.18.14 in the works)
cad/openscad
math/octave
x11/kde4/smokeqt
x11/kde4/ruby-qt
x11/kde4/qyoto

Feedback welcome on the qt5 FLAVOR handling. oks too.

On a sidenote, scintilla/scite too could use an update

Landry
? qscintilla-2.9.3-libqscintilla2.so.5.0
Index: Makefile
===
RCS file: /cvs/ports/editors/qscintilla/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile26 Jul 2017 22:45:19 -  1.18
+++ Makefile28 Oct 2017 14:00:34 -
@@ -1,27 +1,43 @@
 # $OpenBSD: Makefile,v 1.18 2017/07/26 22:45:19 sthen Exp $
 
-COMMENT =  Qt4 port of the Scintilla source code editor
+COMMENT =  Qt port of the Scintilla source code editor
 
 # XXX update py-qscintilla alongside this port (same distfile).
-VERSION =  2.9.3
+VERSION =  2.10.1
 DISTNAME = QScintilla_gpl-${VERSION}
 PKGNAME =  qscintilla-${VERSION}
 CATEGORIES =   editors x11
-REVISION = 0
 
-SHARED_LIBS =  qscintilla2 5.0
 
 HOMEPAGE = http://www.riverbankcomputing.com/software/qscintilla/
 
 # GPLv2/GPLv3
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB += ICE QtGui SM X11 Xext Xi Xinerama Xrender fontconfig
-WANTLIB += freetype m pthread ${COMPILER_LIBCXX}
-
 MASTER_SITES =  ${MASTER_SITE_SOURCEFORGE:=pyqt/}
 
-MODULES =  devel/gettext devel/qmake x11/qt4
+WANTLIB =  ${COMPILER_LIBCXX} m
+MODULES =  devel/gettext devel/qmake
+FLAVORS = qt5
+FLAVOR?=
+
+.if ${FLAVOR} == "qt5"
+FULLPKGNAME =  qscintilla-qt5-${VERSION}
+QTVER =qt5
+MODULES += x11/qt5
+SHARED_LIBS =  qscintilla2_qt5 0.0 #13.0
+
+WANTLIB += GL Qt5Core Qt5Gui Qt5PrintSupport Qt5Widgets
+.else
+QTVER =qt4
+MODULES += x11/qt4
+SHARED_LIBS =  qscintilla2_qt4 0.0 #13.0
+
+WANTLIB += ICE QtGui SM X11 Xext Xi Xinerama Xrender fontconfig
+WANTLIB += freetype pthread
+.endif
+
+SUBST_VARS +=  QTVER
 
 SEPARATE_BUILD =   No
 
Index: distinfo
===
RCS file: /cvs/ports/editors/qscintilla/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo30 Aug 2016 15:56:09 -  1.6
+++ distinfo28 Oct 2017 14:00:34 -
@@ -1,2 +1,2 @@
-SHA256 (QScintilla_gpl-2.9.3.tar.gz) = 
mKq5PXOwVjWGfC/HV6yzg7WFagtBbj/XZZ8YeZlt234=
-SIZE (QScintilla_gpl-2.9.3.tar.gz) = 2503568
+SHA256 (QScintilla_gpl-2.10.1.tar.gz) = 
l/mKnZH5CNts43/sxtJB2VWziKHEhxc7YHJsupo9+mQ=
+SIZE (QScintilla_gpl-2.10.1.tar.gz) = 2663446
Index: patches/patch-Qt4Qt5_qscintilla_pro
===
RCS file: /cvs/ports/editors/qscintilla/patches/patch-Qt4Qt5_qscintilla_pro,v
retrieving revision 1.3
diff -u -r1.3 patch-Qt4Qt5_qscintilla_pro
--- patches/patch-Qt4Qt5_qscintilla_pro 30 Aug 2016 15:56:09 -  1.3
+++ patches/patch-Qt4Qt5_qscintilla_pro 28 Oct 2017 14:00:34 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-Qt4Qt5_qscintilla_pro,v 1.3 2016/08/30 15:56:09 landry Exp $
 Qt4Qt5/qscintilla.pro.orig Mon Jul 25 16:13:58 2016
-+++ Qt4Qt5/qscintilla.pro  Tue Aug  9 10:32:10 2016
-@@ -47,7 +47,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
+Index: Qt4Qt5/qscintilla.pro
+--- Qt4Qt5/qscintilla.pro.orig
 Qt4Qt5/qscintilla.pro
+@@ -66,7 +66,7 @@ unix:!macx {
  # Scintilla namespace rather than pollute the global namespace.
  #DEFINES += SCI_NAMESPACE
  
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/qscintilla/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST   30 Aug 2016 15:56:09 -  1.5
+++ pkg/PLIST   28 Oct 2017 14:00:34 -
@@ -1,71 +1,74 @@
 @comment $OpenBSD: PLIST,v 1.5 2016/08/30 15:56:09 landry Exp $
-include/X11/qt4/Qsci/
-include/X11/qt4/Qsci/qsciabstractapis.h
-include/X11/qt4/Qsci/qsciapis.h
-include/X11/qt4/Qsci/qscicommand.h
-include/X11/qt4/Qsci/qscicommandset.h
-include/X11/qt4/Qsci/qscidocument.h
-include/X11/qt4/Qsci/qsciglobal.h
-include/X11/qt4/Qsci/qscilexer.h
-include/X11/qt4/Qsci/qscilexeravs.h
-include/X11/qt4/Qsci/qscilexerbash.h
-include/X11/qt4/Qsci/qscilexerbatch.h
-include/X11/qt4/Qsci/qscilexercmake.h
-include/X11/qt4/Qsci/qscilexercoffeescript.h
-include/X11/qt4/Qsci/qscilexercpp.h
-include/X11/qt4/Qsci/qscilexercsharp.h

Re: [pretest] emacs-26.0.90

[Grégoire Jadi]

Jeremie Courreges-Anglas  writes:

> On Thu, Oct 26 2017, Jeremie Courreges-Anglas  wrote:
>> On Wed, Oct 25 2017, Jeremie Courreges-Anglas  wrote:
>>> On Sun, Oct 15 2017, Jeremie Courreges-Anglas  wrote:
 Here's a diff for the first pretest in the emacs-26 release cycle.
 Among other things, emacs now uses system malloc(3) at runtime (gmalloc
 is still used at build/unexec time).

 As usual build & test reports are welcome, especially if you use an arch
 different from amd64 / arm, or if you use one of the graphical flavors.
>>>
>>> Thanks for the feedback so far, updated diff (sync with -current, use
>>> https instead of ftp).  I think we're going to stay with .xz tarballs
>>> for next releases, ~40M vs ~60M.
>>>
>>> The build is broken on armv7.  Tests on any arch you have at hand are
>>> still welcome.
>>
>> The previous patch was messed up, sorry about that.
>
> Fixed the gtk3 flavor, with an additional patch from upstream to unbreak
> on arm.
Hello,

gtk3 on amd64 builds and runs correctly.

Thanks.

> Index: Makefile
> ===
> RCS file: /d/cvs/ports/editors/emacs/Makefile,v
> retrieving revision 1.71
> diff -u -p -r1.71 Makefile
> --- Makefile  19 Oct 2017 16:28:48 -  1.71
> +++ Makefile  27 Oct 2017 15:44:36 -
> @@ -2,8 +2,7 @@
>
>  COMMENT= GNU editor: extensible, customizable, self-documenting
>
> -VERSION= 25.3
> -REVISION=0
> +VERSION= 26.0.90
>  DISTNAME=emacs-${VERSION}
>
>  CATEGORIES=  editors
> @@ -17,7 +16,8 @@ PERMIT_PACKAGE_CDROM=   Yes
>
>  WANTLIB= c m ncurses pthread gnutls xml2 z
>
> -MASTER_SITES=${MASTER_SITE_GNU:=emacs/}
> +MASTER_SITES=https://alpha.gnu.org/gnu/emacs/pretest/
> +EXTRACT_SUFX=.tar.xz
>
>  USE_GMAKE=   Yes
>
> @@ -47,46 +47,47 @@ LIB_DEPENDS=  security/gnutls \
>  .if ${FLAVOR} == "no_x11"
>  CONFIGURE_ARGS+= --without-x \
>   --without-dbus \
> - --without-gconf \
>   --without-gsettings \
> - --without-jpeg
> + --without-jpeg \
> + --without-lcms2
>  .else
>  LIB_DEPENDS+=x11/dbus \
>   x11/gnome/librsvg \
> - devel/gconf2 \
>   graphics/jpeg \
>   graphics/png \
>   graphics/tiff \
>   graphics/giflib \
> - graphics/ImageMagick
> + graphics/ImageMagick \
> + graphics/lcms2
>  RUN_DEPENDS+=devel/desktop-file-utils \
>   devel/xdg-utils \
>   x11/gtk+3,-guic
>  . if ${FLAVOR} == "athena"
>  CONFIGURE_ARGS+= --with-x-toolkit=athena
>  LIB_DEPENDS+=x11/Xaw3d
> -WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 Xaw3d
> -WANTLIB += Xext Xft Xinerama Xmu Xpm Xrandr Xrender Xt cairo dbus-1
> -WANTLIB += fontconfig freetype gconf-2 gdk_pixbuf-2.0 gif gio-2.0
> -WANTLIB += glib-2.0 gobject-2.0 intl jpeg png rsvg-2 tiff X11-xcb Xfixes xcb
> +WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 X11-xcb
> +WANTLIB += Xaw3d Xext Xfixes Xft Xinerama Xmu Xpm Xrandr Xrender
> +WANTLIB += Xt cairo dbus-1 fontconfig freetype gdk_pixbuf-2.0
> +WANTLIB += gif gio-2.0 glib-2.0 gobject-2.0 intl jpeg lcms2 png
> +WANTLIB += rsvg-2 tiff xcb
>  . elif ${FLAVOR} == "gtk2"
>  CONFIGURE_ARGS+= --with-x-toolkit=gtk2
>  LIB_DEPENDS+=x11/gtk+2
> -WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 Xcomposite
> -WANTLIB += Xcursor Xdamage Xext Xfixes Xft Xi Xinerama Xpm Xrandr
> -WANTLIB += Xrender atk-1.0 cairo dbus-1 fontconfig freetype gconf-2
> -WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0
> -WANTLIB += gtk-x11-2.0 intl jpeg pango-1.0 pangocairo-1.0 pangoft2-1.0
> -WANTLIB += png rsvg-2 tiff X11-xcb xcb
> +WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 X11-xcb
> +WANTLIB += Xcomposite Xcursor Xdamage Xext Xfixes Xft Xi Xinerama
> +WANTLIB += Xpm Xrandr Xrender atk-1.0 cairo dbus-1 fontconfig
> +WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gif gio-2.0 glib-2.0
> +WANTLIB += gobject-2.0 gtk-x11-2.0 intl jpeg lcms2 pango-1.0 pangocairo-1.0
> +WANTLIB += pangoft2-1.0 png rsvg-2 tiff xcb
>  . elif ${FLAVOR} == "gtk3"
>  CONFIGURE_ARGS+= --with-x-toolkit=gtk3
>  LIB_DEPENDS+=x11/gtk+3
>  WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 X11-xcb
> -WANTLIB += Xfixes Xft Xinerama Xpm Xrandr Xrender atk-1.0 cairo
> -WANTLIB += cairo-gobject dbus-1 fontconfig freetype gconf-2 gdk-3
> +WANTLIB += Xext Xfixes Xft Xinerama Xpm Xrandr Xrender atk-1.0
> +WANTLIB += cairo cairo-gobject dbus-1 fontconfig 

CVS: cvs.openbsd.org: ports

[Gonzalo L . Rodriguez]

CVSROOT:/cvs
Module name:ports
Changes by: gonz...@cvs.openbsd.org 2017/10/29 07:01:32

Modified files:
security/lynis : Makefile distinfo 

Log message:
Update for Lynis to 2.5.6

OK benoit@

arm bulk build report

[phessler]

bulk build on armv7-0.ports.openbsd.org
started on  Thu Oct 19 08:17:15 MDT 2017
finished at Sun Oct 29 06:52:52 MDT 2017
lasted 10D15h35m
done with kern.version=OpenBSD 6.2-current (GENERIC) #104: Thu Oct 19 01:43:48 
MDT 2017

built packages:7979
Oct 19:240
Oct 20:160
Oct 21:294
Oct 22:245
Oct 23:190
Oct 24:140
Oct 25:209
Oct 26:459
Oct 27:881
Oct 28:2818
Oct 29:2342



build failures: 46
http://build-failures.rhaalovely.net//arm/2017-10-19/archivers/woff2.log
http://build-failures.rhaalovely.net//arm/2017-10-19/audio/audiality2.log
http://build-failures.rhaalovely.net//arm/2017-10-19/audio/grip.log
http://build-failures.rhaalovely.net//arm/2017-10-19/cad/openscad.log
http://build-failures.rhaalovely.net//arm/2017-10-19/converters/k2pdfopt.log
http://build-failures.rhaalovely.net//arm/2017-10-19/databases/citus.log
http://build-failures.rhaalovely.net//arm/2017-10-19/databases/pg_statsinfo.log
http://build-failures.rhaalovely.net//arm/2017-10-19/databases/pgpool.log
http://build-failures.rhaalovely.net//arm/2017-10-19/databases/postgresql-pllua.log
http://build-failures.rhaalovely.net//arm/2017-10-19/databases/postgresql-previous.log
http://build-failures.rhaalovely.net//arm/2017-10-19/databases/repmgr.log
http://build-failures.rhaalovely.net//arm/2017-10-19/databases/skytools.log
http://build-failures.rhaalovely.net//arm/2017-10-19/devel/gtest.log
http://build-failures.rhaalovely.net//arm/2017-10-19/devel/libvmime.log
http://build-failures.rhaalovely.net//arm/2017-10-19/devel/mygui.log
http://build-failures.rhaalovely.net//arm/2017-10-19/devel/reposurgeon.log
http://build-failures.rhaalovely.net//arm/2017-10-19/devel/sdcc.log
http://build-failures.rhaalovely.net//arm/2017-10-19/editors/TeXmacs.log
http://build-failures.rhaalovely.net//arm/2017-10-19/emulators/dgen-sdl.log
http://build-failures.rhaalovely.net//arm/2017-10-19/games/pokerth.log
http://build-failures.rhaalovely.net//arm/2017-10-19/geo/geos.log
http://build-failures.rhaalovely.net//arm/2017-10-19/graphics/dcmtk.log
http://build-failures.rhaalovely.net//arm/2017-10-19/graphics/djview4.log
http://build-failures.rhaalovely.net//arm/2017-10-19/graphics/enblend-enfuse.log
http://build-failures.rhaalovely.net//arm/2017-10-19/graphics/gdcm.log
http://build-failures.rhaalovely.net//arm/2017-10-19/graphics/gifsicle.log
http://build-failures.rhaalovely.net//arm/2017-10-19/graphics/slop.log
http://build-failures.rhaalovely.net//arm/2017-10-19/lang/erlang/16.log
http://build-failures.rhaalovely.net//arm/2017-10-19/lang/erlang/17,-main.log
http://build-failures.rhaalovely.net//arm/2017-10-19/lang/erlang/18.log
http://build-failures.rhaalovely.net//arm/2017-10-19/lang/erlang/19.log
http://build-failures.rhaalovely.net//arm/2017-10-19/lang/verilator.log
http://build-failures.rhaalovely.net//arm/2017-10-19/mail/bogofilter,db4.log
http://build-failures.rhaalovely.net//arm/2017-10-19/math/gnumeric.log
http://build-failures.rhaalovely.net//arm/2017-10-19/math/octave.log
http://build-failures.rhaalovely.net//arm/2017-10-19/net/filezilla.log
http://build-failures.rhaalovely.net//arm/2017-10-19/net/gnugk.log
http://build-failures.rhaalovely.net//arm/2017-10-19/net/owncloudclient.log
http://build-failures.rhaalovely.net//arm/2017-10-19/net/pidgin-sipe.log
http://build-failures.rhaalovely.net//arm/2017-10-19/net/psi.log
http://build-failures.rhaalovely.net//arm/2017-10-19/net/synergy.log
http://build-failures.rhaalovely.net//arm/2017-10-19/print/scribus.log
http://build-failures.rhaalovely.net//arm/2017-10-19/security/botan2.log
http://build-failures.rhaalovely.net//arm/2017-10-19/sysutils/facter.log
http://build-failures.rhaalovely.net//arm/2017-10-19/sysutils/logstalgia.log
http://build-failures.rhaalovely.net//arm/2017-10-19/telephony/asterisk.log

recurrent failures
 failures/audio/audiality2.log
 failures/audio/grip.log
 failures/cad/openscad.log
 failures/databases/repmgr.log
 failures/databases/skytools.log
 failures/devel/gtest.log
 failures/devel/mygui.log
 failures/devel/reposurgeon.log
 failures/devel/sdcc.log
 failures/geo/geos.log
 failures/graphics/dcmtk.log
 failures/graphics/djview4.log
 failures/graphics/gdcm.log
 failures/graphics/gifsicle.log
 failures/graphics/slop.log
 failures/lang/erlang/17,-main.log
 failures/lang/erlang/18.log
 failures/lang/erlang/19.log
 failures/mail/bogofilter,db4.log
 failures/math/gnumeric.log
 failures/net/filezilla.log
 failures/net/gnugk.log
 failures/net/owncloudclient.log
 failures/net/psi.log
 failures/net/synergy.log
 failures/print/scribus.log
 failures/security/botan2.log
 failures/sysutils/facter.log
 failures/telephony/asterisk.log
new failures
+++ ls-failures Sun Oct 29 06:55:01 2017
+failures/archivers/woff2.log
+failures/devel/libvmime.log
+failures/graphics/enblend-enfuse.log
+failures/lang/verilator.log
+failures/math/octave.log
+failures/sysutils/logstalgia.log
resolved failures
--- ../old/arm/last//ls-failuresThu Oct 12 09:25:31 2017
-failures/lang/swi-prolog.log

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2017/10/29 06:05:06

Modified files:
x11/xfce4/xfce4-notifyd: Makefile distinfo 
x11/xfce4/xfce4-notifyd/pkg: PLIST 

Log message:
Update to xfce4-notifyd 0.4.0.

[UPDATE] textproc/uncrustify

[Remi Pointel]

Hi,

this is the diff to update uncrustify to latest release.

Ok?

Cheers,

Remi.
Index: Makefile
===
RCS file: /cvs/ports/textproc/uncrustify/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- Makefile	26 Jul 2017 22:45:31 -	1.14
+++ Makefile	29 Oct 2017 06:13:56 -
@@ -2,8 +2,7 @@
 
 COMMENT =		source code beautifier
 
-DISTNAME =		uncrustify-0.64
-REVISION =		1
+DISTNAME =		uncrustify-0.65
 
 CATEGORIES =		textproc devel
 
Index: distinfo
===
RCS file: /cvs/ports/textproc/uncrustify/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo	7 Apr 2017 06:04:45 -	1.7
+++ distinfo	29 Oct 2017 06:13:56 -
@@ -1,2 +1,2 @@
-SHA256 (uncrustify-0.64.tar.gz) = D8oF/ousLNgL8+13N4yC/+Nl83o/gLjgyi27PG4l89c=
-SIZE (uncrustify-0.64.tar.gz) = 1178137
+SHA256 (uncrustify-0.65.tar.gz) = f3r8Lsuvnas8Rg2jm7l6d8GZ5iod2L0mMA71Z5p4nXY=
+SIZE (uncrustify-0.65.tar.gz) = 1377090
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/uncrustify/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST	7 Apr 2017 06:04:45 -	1.3
+++ pkg/PLIST	29 Oct 2017 06:13:56 -
@@ -2,6 +2,7 @@
 @bin bin/uncrustify
 @man man/man1/uncrustify.1
 share/uncrustify/
+share/uncrustify/MS-calling_conventions.cfg
 share/uncrustify/amxmodx.cfg
 share/uncrustify/ben.cfg
 share/uncrustify/ben2.cfg
@@ -14,6 +15,7 @@ share/uncrustify/kr-indent.cfg
 share/uncrustify/linux-indent.cfg
 share/uncrustify/linux.cfg
 share/uncrustify/mono.cfg
+share/uncrustify/msvc.cfg
 share/uncrustify/objc.cfg
 share/uncrustify/sun.cfg
 share/uncrustify/xsupplicant.cfg

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/10/29 04:42:21

Modified files:
security/libgcrypt: Makefile 
security/libgcrypt/patches: patch-src_secmem_c 

Log message:
Remove useless includes.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/10/29 04:33:16

Modified files:
textproc/gspell: Makefile distinfo 
textproc/gspell/pkg: PLIST 

Log message:
Update to gspell-1.6.1.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/10/29 04:12:48

Modified files:
x11/gnome/builder: Makefile 

Log message:
Fix comment.

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2017/10/29 04:12:25

Modified files:
x11/xfce4/xfce4-weather: Makefile distinfo 

Log message:
Update to xfce4-weather 0.8.10.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/10/29 04:11:08

Modified files:
devel/spidermonkey38: Makefile 
devel/spidermonkey52: Makefile 

Log message:
Fix comment.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/10/29 04:10:23

Modified files:
games/0ad/base : Makefile 

Log message:
Remove old comment about spidermonkey, it does not use it anymore; no idea
if the COMPILER line should stay though...

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/10/29 04:02:22

Modified files:
textproc/gxml  : Makefile 

Log message:
Explicitely pass --disable-docs in case we have valadoc(1) around; I think
it's the only port in tree that needs this (all others default to disable)

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/10/29 03:16:14

Modified files:
devel/json-glib: Makefile distinfo 
devel/json-glib/pkg: PLIST 
Removed files:
devel/json-glib/patches: patch-configure_ac 

Log message:
update to json-glib-1.4.2

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/10/29 02:59:24

Modified files:
devel/gobject-introspection: Makefile distinfo 
devel/gobject-introspection/patches: patch-configure_ac 
devel/gobject-introspection/pkg: PLIST 

Log message:
update to gobject-introspection-1.54.1

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/10/29 02:58:57

Modified files:
devel/radare2/bindings: Makefile 

Log message:
bump after vala update

reminded by aja@

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/10/29 02:58:12

Modified files:
x11/gnome/libgda: Makefile 
x11/gnome/code-assistance: Makefile 
x11/gnome/code-assistance/patches: patch-configure 

Log message:
recognize vala-0.38

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/10/29 02:57:25

Modified files:
x11/gnome/builder: Makefile 

Log message:
missed bump that got lost in merging -r1.56

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/10/29 02:56:43

Modified files:
x11/gnome/builder: Makefile 
x11/gnome/builder/pkg: PLIST 

Log message:
disable vala support for now, it will be auto-unbroken when updating
gnome-builder next week

ok aja@

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2017/10/29 02:52:47

Modified files:
lang/vala  : Makefile distinfo 
Added files:
lang/vala/pkg  : DESCR-main DESCR-valadoc PLIST-main 
 PLIST-valadoc 
Removed files:
lang/vala/pkg  : DESCR PLIST 

Log message:
- update to vala-0.38.2
- split valadoc into subpackage (merged into vala upstream)

ok aja@

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/10/29 02:28:44

Modified files:
x11/gnome/librsvg: Makefile 
x11/gnome/librsvg/pkg: PLIST 

Log message:
Disable vala bindings for the time being to prevent a cyclic dependency
with the upcoming vala update from jasper@

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/10/29 02:24:26

Modified files:
print/poppler  : Makefile 

Log message:
Drop LIB_DEPENDS from -main to prevent inheriting the Qt 4 and 5
dependencies.

committing on behalf of kili@

UPDATE: graphics/libwebp

[Rafael Sadowski]

Hi All,

Update libwebp to 0.6.0. All consumers built fine with the diff below:

devel/sdl-image/
devel/sdl2-image/
geo/gdal/
geo/spatialite/
geo/librasterlite2/ (??)
graphics/
graphics/GraphicsMagick/
graphics/ImageMagick/
graphics/darktable
graphics/gd/
graphics/gegl03/
graphics/gthumb/
graphics/leptonica/
graphics/mapnik/ (build again)
graphics/openimageio/
graphics/py-Pillow/
graphics/simple-scan
net/telegram-purple/
www/phantomjs/
www/webkit/
www/webkitgtk4/
x11/kde4/runtime/
x11/qt5/qtimageformats/
x11/qt5/qtwebengine/
x11/qt5/qtwebengine/
x11/qt5/qtwebkit/

Ok? Comments?

Best regards,

Rafael

Index: Makefile
===
RCS file: /cvs/ports/graphics/libwebp/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile30 Dec 2016 14:28:31 -  1.15
+++ Makefile28 Oct 2017 14:55:56 -
@@ -2,15 +2,14 @@
 
 COMMENT=   Google WebP image format conversion tool
 
-DISTNAME=  libwebp-0.5.2
+DISTNAME=  libwebp-0.6.0
 CATEGORIES=graphics
 MASTER_SITES=  http://downloads.webmproject.org/releases/webp/
 
-SHARED_LIBS +=  webp 3.0  # 6.0
-SHARED_LIBS +=  webpdecoder  1.0  # 2.0
-SHARED_LIBS +=  webpdemux1.0  # 2.0
-SHARED_LIBS +=  webpextras   0.0  # 0.0
-SHARED_LIBS +=  webpmux  1.0  # 2.0
+SHARED_LIBS +=  webp 4.0  # 6.0
+SHARED_LIBS +=  webpdecoder  2.0  # 2.0
+SHARED_LIBS +=  webpdemux2.0  # 2.0
+SHARED_LIBS +=  webpmux  2.0  # 2.0
 
 HOMEPAGE=  https://developers.google.com/speed/webp/
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/libwebp/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo30 Dec 2016 14:28:31 -  1.10
+++ distinfo28 Oct 2017 14:55:56 -
@@ -1,2 +1,2 @@
-SHA256 (libwebp-0.5.2.tar.gz) = t1MQyBCz7aIix39tbCawYSQOPZBgCV3kSywbrikeze8=
-SIZE (libwebp-0.5.2.tar.gz) = 1221153
+SHA256 (libwebp-0.6.0.tar.gz) = ySgRkinU+PNeIBE/+2Hyge2iZ2NKjcIoWvSw7ifPK0A=
+SIZE (libwebp-0.6.0.tar.gz) = 1302881
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/libwebp/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST   9 May 2016 06:31:56 -   1.6
+++ pkg/PLIST   28 Oct 2017 14:55:56 -
@@ -2,12 +2,12 @@
 @bin bin/cwebp
 @bin bin/dwebp
 @bin bin/gif2webp
+@bin bin/img2webp
 @bin bin/webpmux
 include/webp/
 include/webp/decode.h
 include/webp/demux.h
 include/webp/encode.h
-include/webp/extras.h
 include/webp/mux.h
 include/webp/mux_types.h
 include/webp/types.h
@@ -20,16 +20,12 @@ lib/libwebpdecoder.la
 lib/libwebpdemux.a
 lib/libwebpdemux.la
 @lib lib/libwebpdemux.so.${LIBwebpdemux_VERSION}
-lib/libwebpextras.a
-lib/libwebpextras.la
-@lib lib/libwebpextras.so.${LIBwebpextras_VERSION}
 lib/libwebpmux.a
 lib/libwebpmux.la
 @lib lib/libwebpmux.so.${LIBwebpmux_VERSION}
 lib/pkgconfig/libwebp.pc
 lib/pkgconfig/libwebpdecoder.pc
 lib/pkgconfig/libwebpdemux.pc
-lib/pkgconfig/libwebpextras.pc
 lib/pkgconfig/libwebpmux.pc
 @man man/man1/cwebp.1
 @man man/man1/dwebp.1

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2017/10/29 00:59:08

Modified files:
x11/gnome/totem-pl-parser: Makefile 
Added files:
x11/gnome/totem-pl-parser/patches: patch-meson_build 
   
patch-plparse_totem-pl-parser-videosite_c 
   patch-plparse_totem-pl-parser_c 

Log message:
Re-add meson patch to properly detect libgcrypt.
Fix a couple of leaks (from upstream).
Add missing BDEP on devel/libsoup (reported by landry@)

CVS: cvs.openbsd.org: ports

[Remi Pointel]

CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2017/10/29 00:03:08

Modified files:
security/zaproxy: Makefile distinfo 
security/zaproxy/pkg: PLIST 

Log message:
update zaproxy to 2.6.0.
ok steven@.