CVS: cvs.openbsd.org: ports

[Dmitrij Czarkoff]

CVSROOT:/cvs
Module name:ports
Changes by: czark...@cvs.openbsd.org2015/11/23 12:44:44

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

Log message:
update to dulwich 0.11.2

ok shadchin@

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/11/23 12:11:37

Modified files:
devel/ruby-rspec/3/support: Makefile distinfo 

Log message:
update to rspec-support-3.4.1

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/11/23 12:15:58

Modified files:
games/solarus/solarus: Makefile distinfo 

Log message:
update to solarus-1.4.5

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/11/23 12:15:45

Modified files:
net/gssdp  : Makefile distinfo 

Log message:
update to gssdp-0.14.12

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/11/23 12:17:00

Modified files:
devel/ruby-rspec/specinfra: Makefile distinfo 

Log message:
update to specinfra-2.44.3

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2015/11/23 12:26:49

Modified files:
converters/dos2unix: Makefile distinfo 
converters/dos2unix/pkg: PLIST 

Log message:
Update to dos2unix-7.3.2, adding swedish translations.

Re: [NEW] devel/p5-Data-SExpression

[attila]

attila  writes:

> Hi ports@,
>
> Attached is a port for the Data::SExpression Perl module.  It is a
> dependency of the Perl interface I recently contributed to mail/mu
> upstream, and which will be coming down the pike in some new mu
> release fairly soon.
>
> $ cat pkg/DESCR
> Data::SExpression is a Perl module that parses LISP-like
> S-expressions into Perl data structures.
>
> Passes make test on i386.
>
> Comments, feedback most welcome.
>
> Pax, -A

Ping?  Port attached.

Pax, -A
-- 
http://trac.haqistan.net | att...@stalphonsos.com | 0xE6CC1EDB


p5-Data-SExpression.tgz
Description: proposed new port: devel/p5-Data-SExpression

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2015/11/23 13:34:08

Modified files:
graphics/opencv: Makefile distinfo 
graphics/opencv/patches: patch-CMakeLists_txt 
 patch-cmake_OpenCVFindLibsVideo_cmake 
 patch-modules_core_src_system_cpp 
graphics/opencv/pkg: PLIST-docs PLIST-java PLIST-main 
Added files:
graphics/opencv/patches: 
 
patch-modules_core_include_opencv2_core_version_hpp 

Log message:
Update OpenCV to 2.4.12.3.

This fixes library naming in pkg-config files, as it was reported on ports@.
Also, it'd be last update before OpenCV 3.0, which is WIP (in openbsd-wip).

>From maintainer Rafael Sadowski, thanks!

Re: games/foobillard build failure after Mesa update

[David Coppa]

On Mon, Nov 23, 2015 at 1:58 AM, Jonathan Gray  wrote:
> On Sun, Nov 22, 2015 at 07:10:08PM +0100, Christian Weisgerber wrote:
>> games/foobillard doesn't build any longer after the Mesa 11.0.6 update.
>>
>> ...
>> ball.o: In function `draw_balls':
>> ball.c:(.text+0x65f0): undefined reference to `glGenProgramsNV'
>> ball.c:(.text+0x6605): undefined reference to `glBindProgramNV'
>> ball.c:(.text+0x6636): undefined reference to `glLoadProgramNV'
>> ball.c:(.text+0x6fdc): undefined reference to `glTrackMatrixNV'
>> ball.c:(.text+0x6ffa): undefined reference to `glTrackMatrixNV'
>> ball.c:(.text+0x7018): undefined reference to `glTrackMatrixNV'
>> ball.c:(.text+0x7050): undefined reference to `glProgramParameter4fNV'
>> ball.c:(.text+0x7079): undefined reference to `glBindProgramNV'
>> ball.c:(.text+0x71c0): undefined reference to `glProgramParameter4fNV'
>> collect2: ld returned 1 exit status
>
> Seems to build/run with the following:
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/foobillard/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- Makefile11 Jul 2014 11:20:32 -  1.8
> +++ Makefile23 Nov 2015 00:52:02 -
> @@ -20,6 +20,7 @@ LIB_DEPENDS = graphics/png \
>
>  USE_GMAKE =Yes
>  CONFIGURE_STYLE =  gnu
> +CONFIGURE_ARGS =   --enable-nvidia=no
>  CFLAGS =   -DNO_NV_BUMPREF
>
>  .include 
> --- /dev/null   Mon Nov 23 11:52:23 2015
> +++ patches/patch-src_ball_cMon Nov 23 11:49:39 2015
> @@ -0,0 +1,11 @@
> +$OpenBSD$
> +--- src/ball.c.origMon Nov 23 11:49:01 2015
>  src/ball.c Mon Nov 23 11:49:30 2015
> +@@ -32,6 +32,7 @@
> + #include "options.h"
> + #include "font.h"
> +
> ++#undef GL_VERTEX_PROGRAM_NV
> +
> + #ifdef GL_VERTEX_ARRAY
> +#define USE_VERTEX_ARRAYS
>

ok with me.

A similar workaround is also suggested here:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=240376


Ciao!
David
-- 
"If you try a few times and give up, you'll never get there. But if
you keep at it... There's a lot of problems in the world which can
really be solved by applying two or three times the persistence that
other people will."
-- Stewart Nelson

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/23 03:07:48

Modified files:
security/gnutls: Makefile 

Log message:
Add an http mirror for gnutls (there was an old commented-out one, but it
didn't update very often - new one should be 4x/day). ok ajacoutot@

Re: [update] abcde 2.5.4 -> 2.7.1

[micah muer]

On 11/22/2015 12:11 PM, Marc Peters wrote:

Am 10/22/15 um 16:05 schrieb Marc Peters:

Hi,

here's a diff to bring abcde to the latest release (attached to avoid
mangling). Working here on amd64, just tested with flac, though.

Comments/ok?



Here an updated diff against -current ports.

Comments/OKs?


Marc



I also tested this on amd64, but with mp3 and ogg. Everything worked for me.

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2015/11/23 04:31:37

Modified files:
devel/nspr : Makefile distinfo 
Added files:
devel/nspr/patches: patch-nspr_pr_tests_prfz_c 

Log message:
Update to nspr 4.11.

Tested in a bulk by ajacoutot@, thanks!

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2015/11/23 04:32:12

Modified files:
security/nss   : Makefile distinfo 
security/nss/patches: patch-nss_Makefile 
Added files:
security/nss/patches: patch-nss_lib_util_verref_h 

Log message:
Update to nss 3.21.

Tested in a bulk and ok ajacoutot@, thanks!

Mesa 11.0.6 fallout: x11/wxWidgets

[Christian Weisgerber]

x11/wxWidgets fails to build after the Mesa 11.0.6 update:


===>  Configuring for wxWidgets-2.8.12
Using /usr/obj/ports/wxWidgets-2.8.12/config.site (generated)
configure: loading site script /usr/obj/ports/wxWidgets-2.8.12/config.site
checking build system type... x86_64-unknown-openbsd5.8
checking host system type... x86_64-unknown-openbsd5.8
checking target system type... x86_64-unknown-openbsd5.8
loading argument cache configarg.cache
checking for --enable-gui... yes
checking for --enable-monolithic... no
checking for --enable-plugins... no
checking for --without-subdirs... no
checking for --enable-universal... no
checking for --enable-nanox... no
checking for --enable-gpe... no
checking for --with-libpng... yes
checking for --with-libjpeg... yes
checking for --with-libtiff... yes
checking for --with-libxpm... yes
checking for --with-libmspack... yes
checking for --with-sdl... yes
checking for --with-gnomeprint... no
checking for --with-gnomevfs... no
checking for --with-hildon... no
checking for --with-opengl... yes
checking for --with-dmalloc... no
checking for --with-regex... yes
checking for --with-zlib... yes
checking for --with-odbc... yes
checking for --with-expat... yes
checking for --with-macosx-sdk... 
checking for --with-macosx-version-min... yes
checking for --enable-shared... yes
checking for --enable-optimise... yes
checking for --enable-debug... no
checking for --enable-stl... no
checking for --enable-debug_flag... no
checking for --enable-debug_info... no
checking for --enable-debug_gdb... no
checking for --enable-debug_cntxt... no
checking for --enable-mem_tracing... no
checking for --enable-profile... no
checking for --enable-no_rtti... no
checking for --enable-no_exceptions... no
checking for --enable-permissive... no
checking for --enable-no_deps... no
checking for --enable-vararg_macros... yes
checking for --enable-universal_binary... no
checking for --enable-compat24... no
checking for --disable-compat26... no
checking for --enable-rpath... yes
checking for --enable-objc_uniquifying... no
checking for --enable-abi-incompatible-features... no
checking for --enable-intl... yes
checking for --enable-config... yes
checking for --enable-protocols... yes
checking for --enable-ftp... yes
checking for --enable-http... yes
checking for --enable-fileproto... yes
checking for --enable-sockets... yes
checking for --enable-ole... yes
checking for --enable-dataobj... yes
checking for --enable-ipc... yes
checking for --enable-apple_ieee... yes
checking for --enable-arcstream... yes
checking for --enable-backtrace... no
checking for --enable-catch_segvs... yes
checking for --enable-cmdline... yes
checking for --enable-datetime... yes
checking for --enable-debugreport... yes
checking for --enable-dialupman... yes
checking for --enable-dynlib... yes
checking for --enable-dynamicloader... yes
checking for --enable-exceptions... yes
checking for --enable-ffile... yes
checking for --enable-file... yes
checking for --enable-filesystem... yes
checking for --enable-fontmap... yes
checking for --enable-fs_archive... yes
checking for --enable-fs_inet... yes
checking for --enable-fs_zip... yes
checking for --enable-geometry... yes
checking for --enable-log... yes
checking for --enable-longlong... yes
checking for --enable-mimetype... yes
checking for --enable-mslu... yes
checking for --enable-snglinst... yes
checking for --enable-std_iostreams... yes
checking for --enable-std_string... yes
checking for --enable-stdpaths... yes
checking for --enable-stopwatch... yes
checking for --enable-streams... yes
checking for --enable-sysoptions... yes
checking for --enable-tarstream... yes
checking for --enable-textbuf... yes
checking for --enable-textfile... yes
checking for --enable-timer... yes
checking for --enable-unicode... yes
checking for --enable-sound... yes
checking for --enable-mediactrl... yes
checking for --enable-gstreamer8... no
checking for --enable-printfposparam... yes
checking for --enable-zipstream... yes
checking for --enable-url... yes
checking for --enable-variant... yes
checking for --enable-protocol... yes
checking for --enable-protocol_http... yes
checking for --enable-protocol_ftp... yes
checking for --enable-protocol_file... yes
checking for --enable-threads... yes
checking for --enable-docview... yes
checking for --enable-help... yes
checking for --enable-mshtmlhelp... yes
checking for --enable-html... yes
checking for --enable-htmlhelp... yes
checking for --enable-xrc... yes
checking for --enable-aui... yes
checking for --enable-constraints... yes
checking for --enable-printarch... yes
checking for --enable-mdi... yes
checking for --enable-mdidoc... yes
checking for --enable-loggui... yes
checking for --enable-logwin... yes
checking for --enable-logdialog... yes
checking for --enable-webkit... yes
checking for --enable-richtext... yes
checking for --enable-graphics_ctx... yes
checking for --enable-postscript... yes
checking for --enable-prologio... no
checking for --enable-resources... 

fakescreen

[Stanislaw Adaszewski]

For usage in chroot()-ed environments 
where screen is required (e.g. running rtorrent
as daemon), a detachable virtual screen without the
need for special devices (i.e. running on nodev chroot)
comes in handy. I happen to have written such screen
alternative recently [1]. If you were interested in making it
part of OpenBSD ports, I'd be honored.

Best,

S.

[1] http://algoholic.eu/fakescreen/

Re: Mesa 11.0.6 fallout: x11/wxWidgets

[Stuart Henderson]

On 2015/11/23 13:27, Christian Weisgerber wrote:
> x11/wxWidgets fails to build after the Mesa 11.0.6 update:

I've fixed the autoconf check. It was looking for libGL.a which is no more.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/23 04:41:02

Modified files:
net/rrdtool: Makefile distinfo 
net/rrdtool/patches: patch-bindings_ruby_extconf_rb 
 patch-configure patch-doc_Makefile_in 
 patch-examples_Makefile_in 
 patch-examples_rrdcached_Makefile_in 
 patch-src_Makefile_in 
 patch-src_rrd_config_bottom_h 
net/rrdtool/pkg: PLIST-main PLIST-python 
Added files:
net/rrdtool/patches: patch-bindings_Makefile_in 
 patch-src_rrd_daemon_c 
Removed files:
net/rrdtool/patches: patch-src_rrdupdate_c 

Log message:
update to rrdtool-1.5.5

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/23 04:48:53

Modified files:
net/librenms   : Makefile 
net/librenms/patches: patch-includes_defaults_inc_php 

Log message:
switch LibreNMS rrdtool_version to 1.5 now that rrdtool has been updated
(with 1.5+ more commands are available via rrdcached so files can be created
directly rather than needing separate access to the rrd directory).

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/23 06:08:16

Added files:
x11/wxWidgets/patches: patch-acinclude_m4 

Log message:
When searching for shared lib dirs, instead of just looking for files with
the extensions a so sl dylib dll.a, also search for la files. Fixes wxWidgets
autoconf finding MESA now that there's no static library.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/23 06:05:54

Modified files:
x11/wxWidgets/patches: patch-contrib_src_Makefile_in 

Log message:
regen

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/23 06:28:22

Modified files:
textproc/link-grammar: Makefile distinfo 
textproc/link-grammar/pkg: DESCR-java PLIST-main 
Added files:
textproc/link-grammar/patches: patch-bindings_python_Makefile_in 
textproc/link-grammar/pkg: DESCR-python PLIST-python 

Log message:
Update to link-grammar-5.3.1 and add a -python subpackage.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/23 07:07:10

Modified files:
www/p5-HTML-Lint: Makefile distinfo 

Log message:
Update to p5-HTML-Lint-2.22.

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2015/11/23 06:19:40

Modified files:
devel/cryptopp : Makefile distinfo 
devel/cryptopp/files: cryptopp.pc 
devel/cryptopp/patches: patch-GNUmakefile 
devel/cryptopp/pkg: PLIST 
Removed files:
devel/cryptopp/patches: patch-algebra_h patch-algparam_h 
patch-asn_cpp patch-config_h 
patch-misc_h patch-modarith_h 
patch-osrng_h patch-secblock_h 
patch-smartptr_h patch-stdcpp_h 

Log message:
Update to cryptopp-5.6.3

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2015/11/23 07:17:43

Modified files:
net/openfire   : Makefile distinfo 

Log message:
Update to openfire-3.10.3.

from Marc Peters (maintainer)

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2015/11/23 07:27:37

Modified files:
devel/cryptopp : Makefile 

Log message:
Update license marker

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/23 07:32:16

Modified files:
textproc/py-numpydoc: Makefile distinfo 
textproc/py-numpydoc/pkg: PLIST 

Log message:
Update to py-numpydoc-0.5.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/23 07:32:45

Modified files:
devel/ipython  : Makefile 
devel/ipython/pkg: PLIST 

Log message:
Sync after py-numpydoc and set PORTHOME.

Re: Build Qt5 subpackage

[Matthias Kilian]

Hi Vadim,

On Tue, Nov 24, 2015 at 12:31:08AM +0300, Vadim Zhukov wrote:
> This patch adds Qt5 support to poppler, resulting in one more
> subpackage (guess it's name!) and a few more hunks to the patch
> for configure script. 
> 
> I need this for KDE Frameworks (i.e., KDE5 core libraries). Tested
> on amd64 for a few releases of poppler already.
> 
> Okay?

I've no problem with this, but as sthen noticed, it pulls in both
libstdc++ and libestdc++, as can also seen with objdump:

objdump -p poppler-0.38.0/fake-amd64/usr/local/lib/libpoppler-qt5.so.0.0 | grep 
stdc
  NEEDED  libstdc++.so.57.0
  NEEDED  libestdc++.so.17.0

But if this causes trouble, it could be fixed later, so ok for now.

Ciao,
Kili

> Index: Makefile
> ===
> RCS file: /cvs/ports/print/poppler/Makefile,v
> retrieving revision 1.99
> diff -u -p -r1.99 Makefile
> --- Makefile  20 Nov 2015 07:47:44 -  1.99
> +++ Makefile  23 Nov 2015 20:35:09 -
> @@ -3,6 +3,7 @@
>  COMMENT-main=PDF rendering library
>  COMMENT-qt=  qt interface to PDF rendering library
>  COMMENT-qt4= qt4 interface to PDF rendering library
> +COMMENT-qt5= Qt5 interface to PDF rendering library
>  COMMENT-utils=   PDF conversion tools and utilities
>  
>  V=   0.38.0
> @@ -12,12 +13,14 @@ PKGNAME-main= poppler-$V
>  PKGNAME-utils=   poppler-utils-$V
>  PKGNAME-qt=  poppler-qt-$V
>  PKGNAME-qt4= poppler-qt4-$V
> +PKGNAME-qt5= poppler-qt5-$V
>  OLDSHIT =poppler-0.16.7
>  
>  SHARED_LIBS +=   poppler  33.0 # 57.0
>  SHARED_LIBS +=   poppler-glib 14.0 # 15.0
>  SHARED_LIBS +=   poppler-qt   12.0 # 3.0
>  SHARED_LIBS +=   poppler-qt4  18.0 # 13.0
> +SHARED_LIBS +=   poppler-qt5  0.0  # 10.0
>  SHARED_LIBS +=   poppler-cpp  6.1  # 2.1
>  
>  DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
> @@ -31,13 +34,14 @@ PERMIT_PACKAGE_CDROM= Yes
>  
>  MASTER_SITES=${HOMEPAGE}
>  
> -PSEUDO_FLAVORS=no_qt no_qt4 bootstrap
> +PSEUDO_FLAVORS=no_qt no_qt4 no_qt5 bootstrap
>  # XXX not strictly a bootstrap loop, but on the critical path for libreoffice
> -FLAVOR?=no_qt no_qt4 bootstrap
> +FLAVOR?=no_qt no_qt4 no_qt5 bootstrap
>  
>  NOT_FOR_ARCHS-qt4 = arm
> +NOT_FOR_ARCHS-qt5 = arm
>  
> -MULTI_PACKAGES=-main -qt -qt4 -utils
> +MULTI_PACKAGES=-main -qt -qt4 -qt5 -utils
>  
>  .include 
>  
> @@ -55,8 +59,11 @@ MODULES+=  x11/qt4
>  CONFIGURE_ARGS+= --disable-poppler-qt4
>  .endif
>  
> -# until Qt5 is enabled
> +.if ${BUILD_PACKAGES:M-qt5}
> +MODULES+=x11/qt5
> +.else
>  CONFIGURE_ARGS+= --disable-poppler-qt5
> +.endif
>  
>  MODULES+=devel/gettext
>  
> @@ -79,6 +86,9 @@ LIB_DEPENDS-qt= ${MODQT3_LIB_DEPENDS} \
>  LIB_DEPENDS-qt4=${MODQT4_LIB_DEPENDS} \
>   print/poppler
>  
> +LIB_DEPENDS-qt5=${MODQT5_LIB_DEPENDS} \
> + print/poppler
> +
>  LIB_DEPENDS-utils= print/poppler
>  
>  WANTLIB-main=${cWANTLIB} Xext ffi gio-2.0 glib-2.0 gmodule-2.0 \
> @@ -91,6 +101,12 @@ WANTLIB-qt4=${cWANTLIB} ${MODQT4_WAN
>   SM X11 Xext Xi Xinerama Xrender ffi glib-2.0 \
>   gobject-2.0 gthread-2.0 iconv intl lcms2 openjpeg \
>   png poppler pcre pthread-stubs xcb
> +WANTLIB-qt5= ${cWANTLIB} ${MODQT5_WANTLIB} ${MODGCC4_CPPWANTLIB} \
> + GL Qt5Core Qt5Gui Qt5Widgets Qt5Xml X11 X11-xcb Xau \
> + Xdamage Xdmcp Xext Xfixes Xxf86vm drm execinfo ffi glapi \
> + glib-2.0 gobject-2.0 gthread-2.0 iconv icudata icui18n \
> + icuuc intl lcms2 openjpeg pcre pcre16 png poppler \
> + pthread-stubs xcb xcb-dri2 xcb-glx
>  WANTLIB-utils=   X11 Xext Xrender c cairo fontconfig lcms2 m pixman-1 \
>   png pthread-stubs xcb xcb-render xcb-shm openjpeg \
>   poppler z ${cWANTLIB}
> @@ -105,10 +121,19 @@ CONFIGURE_ARGS+=--enable-xpdf-headers \
>  
>  CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
>   LDFLAGS="-L${LOCALBASE}/lib" \
> - LIBJPEG_CFLAGS="-I${LOCALBASE}/include"
> + LIBJPEG_CFLAGS="-I${LOCALBASE}/include" \
> + ac_cv_prog_MOCQT4=${MODQT4_MOC} \
> + ac_cv_prog_MOCQT5=${MODQT5_MOC}
>  
>  USE_GMAKE=   Yes
>  
> +MAIN_CC= /usr/bin/cc
> +MAIN_CXX=/usr/bin/c++
> +.if "${USE_CCACHE:L}" == "yes"
> +MAIN_CC:=ccache ${MAIN_CC}
> +MAIN_CXX:=   ccache ${MAIN_CXX}
> +.endif
> +
>  post-extract:
>   cd ${WRKDIST} && \
>   for i in poppler-qt-uninstalled.pc.in poppler-qt.pc.cmake \
> @@ -117,5 +142,12 @@ post-extract:
>   done; \
>   ln -sf ../../${OLDSHIT}/m4/qt.m4 m4/qt.m4
>   cd ${WRKDIST} && cp -R ../${OLDSHIT}/qt qt
> +
> +post-configure:
> + find ${WRKBUILD} -name Makefile \! -path '*/qt5/*' -print0 | xargs -0 \
> + perl -pi -e 's,^CC = \S+,CC = ${MAIN_CC},;' \
> +

Re: UPDATE: devel/doxygen 1.8.2 -> 1.8.10

[Rafael Sadowski]

On Sun Nov 22, 2015 at 04:51:14PM +0100, Rafael Sadowski wrote:
> Hi ports@
> 
> after my first attempt here is the new diff to update doxygen.
> 
> doxygen port highlights:
> 
> - switch to CMake
> - Don't use own libmd5 but base md5
> - Use MD5Data() instead of MD5Buffer+MD5SigToString
> 
> I checked all ports with doxygen usage.
> 
> - No changes with 1.8.10:
> 
> audio/liblo
> database/soprano
> devel/simulavr
> devel/tclap
> math/ginac
> graphics/digikam-kde4
> graphics/opencv

... still no plist changes in current opencv 2.4.12.3

UPDATE: devel/py-parsing 2.0.6

[Alexandr Shadchin]

Hi,

This diff updates py-parsing to the latest release.
Tested on amd64.

Comments ? OK ?

-- 
Alexandr Shadchin

Index: Makefile
===
RCS file: /cvs/ports/devel/py-parsing/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile5 Nov 2015 07:10:49 -   1.25
+++ Makefile24 Nov 2015 05:31:45 -
@@ -2,7 +2,7 @@
 
 COMMENT =  Python parsing module
 
-MODPY_EGG_VERSION =2.0.5
+MODPY_EGG_VERSION =2.0.6
 DISTNAME = pyparsing-${MODPY_EGG_VERSION}
 PKGNAME =  ${DISTNAME:S/py/py-/}
 CATEGORIES =   devel
Index: distinfo
===
RCS file: /cvs/ports/devel/py-parsing/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo5 Nov 2015 07:10:49 -   1.17
+++ distinfo24 Nov 2015 05:31:45 -
@@ -1,2 +1,2 @@
-SHA256 (pyparsing-2.0.5.tar.gz) = WHVr8z6YnYSschQuTKVYzxDHeKMjPtsKhmMvJxQJup4=
-SIZE (pyparsing-2.0.5.tar.gz) = 1140072
+SHA256 (pyparsing-2.0.6.tar.gz) = rqaQQnUq1+nENu6mrl1A5zZC4n9Q7bbaSiUyAw71Mto=
+SIZE (pyparsing-2.0.6.tar.gz) = 1140849

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/23 22:44:06

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

Log message:
Update to gspell-0.2.1.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/23 23:12:25

Modified files:
x11/gnome/latexila: Makefile 
Added files:
x11/gnome/latexila/patches: patch-configure_ac 
patch-src_document_view_vala 

Log message:
Adapt code for GspellLanguageChooserDialog change (upstream).

py-qt5

[Stuart Henderson]

Based on the py-qt4 port, though I haven't figured out which if
any modules should be zapped so I've not done the "only --enable
a list of named modules" thing that py-qt4 does. Any comments?



py-qt5.tgz
Description: application/tar-gz

[NEW] security/zaproxy

[sebastien dellac]

Hi,

Please, find enclosed a tarball for the owasp tool zaproxy.

Question about this new port: there is a zap.sh launcher provided with 
sources, however it is not ideal because it requires bash (which I 
suppose shouldn't be a prerequisite) and does not handle OpenBSD OS in 
its OS detection cases. Consequently, I reckoned two options:
1. rewrite a simple shell script on the model of original zap.sh, but 
only for OpenBSD, and uses it as launcher

2. use a simple diff patch in the port and add a RUN_DEPENDS with bash.

I have chosen the first option, please tell me if there is a better way.

Thx!

---
Comment:
web application security tool

Description:
The OWASP Zed Attack Proxy (ZAP) is an easy to use integrated penetration
testing tool for finding vulnerabilities in web applications.

It is designed to be used by people with a wide range of security 
experience and

as such is ideal for developers and functional testers who are new to
penetration testing.

ZAP provides automated scanners as well as a set of tools that allow you 
to find

security vulnerabilities manually.

Maintainer: sebastien dellac 

WWW: https://www.owasp.org/index.php/ZAP
---

Ok?
Cheers!
--
Sebastien


zaproxy-2.4.2.tar.gz
Description: application/gzip

CVS: cvs.openbsd.org: ports

[Jonathan Gray]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2015/11/23 20:13:26

Modified files:
games/foobillard: Makefile 
Added files:
games/foobillard/patches: patch-src_ball_c 

Log message:
Disable the nvidia extension paths.  The code in this unmaintained
version of foobillard seems to believe if one nvidia extension
is present the rest are.

Fixes build breakage after the mesa 11.0.6 update reported by naddy@
ok dcoppa@

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/23 08:10:57

Modified files:
net/ocserv : Makefile 
net/ocserv/patches: patch-doc_sample_config 

Log message:
enable radius support in ocserv

CVS: cvs.openbsd.org: ports

[Remi Pointel]

CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2015/11/23 09:01:14

Modified files:
security/burpsuite: Makefile 

Log message:
add javaPathHelper to RUN_DEPENDS, used in files/burpsuite.sh.
bump REVISION.
spotted by Sebastien Dellac (thanks).

Update: devel/py-dulwich 0.11.1 -> 0.11.2

[Dmitrij D. Czarkoff]

Hi!

Below is an update for devel/py-dulwich (0.11.1 -> 0.11.2).  Seemingly
no big chnages.

I switched the port back to fetching files from PyPI, because new
distfile isn't available from download section of the homepage.

OK?

-- 
Dmitrij D. Czarkoff

Index: Makefile
===
RCS file: /cvs/ports/devel/py-dulwich/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile29 Sep 2015 10:51:53 -  1.20
+++ Makefile23 Nov 2015 08:47:55 -
@@ -2,10 +2,9 @@
 
 COMMENT =  pure Python implementation of Git file formats and 
protocols
 
-MODPY_EGG_VERSION =0.11.1
+MODPY_EGG_VERSION =0.11.2
 DISTNAME = dulwich-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 0
 
 CATEGORIES =   devel
 
@@ -18,8 +17,8 @@ PERMIT_PACKAGE_CDROM =Yes
 
 WANTLIB += pthread ${MODPY_WANTLIB}
 
-MASTER_SITES = ${HOMEPAGE:=releases/}
 MODULES =  lang/python
+MODPY_PI = Yes
 MODPY_SETUPTOOLS = Yes
 MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
 
Index: distinfo
===
RCS file: /cvs/ports/devel/py-dulwich/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo23 Sep 2015 07:17:00 -  1.6
+++ distinfo23 Nov 2015 08:48:09 -
@@ -1,2 +1,2 @@
-SHA256 (dulwich-0.11.1.tar.gz) = hO/tkwETec29yV7oEXnVmr+D7wVruuPRxS006l25e8M=
-SIZE (dulwich-0.11.1.tar.gz) = 289232
+SHA256 (dulwich-0.11.2.tar.gz) = pUPieY2lYA/nPtcUcPZ7zZJhH04kkdDtOjthwvkcv0A=
+SIZE (dulwich-0.11.2.tar.gz) = 290404
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-dulwich/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST   23 Sep 2015 07:17:00 -  1.5
+++ pkg/PLIST   23 Nov 2015 09:16:52 -
@@ -26,6 +26,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/dulwich/contrib/
 lib/python${MODPY_VERSION}/site-packages/dulwich/contrib/__init__.py
 lib/python${MODPY_VERSION}/site-packages/dulwich/contrib/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/contrib/paramiko_vendor.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/contrib/paramiko_vendor.pyc
 lib/python${MODPY_VERSION}/site-packages/dulwich/contrib/swift.py
 lib/python${MODPY_VERSION}/site-packages/dulwich/contrib/swift.pyc
 lib/python${MODPY_VERSION}/site-packages/dulwich/contrib/test_swift.py

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/23 08:10:06

Log message:
import ports/net/radcli, ok benoit@

radcli is a library for writing RADIUS Clients. It aims to allow writing
a RADIUS-aware application in less than 50 lines of code. It is based on the
freeradius-client library, but legacy code has been removed; IPv6 support,
pkg-config, TLS/DTLS, and API documentation have been added. It remains
source compatible with radiusclient-ng and freeradius-client.

Status:

Vendor Tag: sthen
Release Tags:   sthen_20151123

N ports/net/radcli/Makefile
N ports/net/radcli/distinfo
N ports/net/radcli/pkg/PLIST
N ports/net/radcli/pkg/DESCR
N ports/net/radcli/patches/patch-lib_util_h

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/23 08:10:28

Modified files:
net: Makefile 

Log message:
+radcli

Re: [update] abcde 2.5.4 -> 2.7.1; take 3

[Marc Peters]

Am 11/22/15 um 22:11 schrieb Marc Peters:
> 
> Here an updated diff against -current ports.
> 
> Comments/OKs?
> 
> 
> Marc
> 

As spotted offlist, now without REVISION.
? abcde-2.7.1.patch
Index: Makefile
===
RCS file: /cvs/ports/audio/abcde/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile	24 Aug 2015 23:19:57 -	1.23
+++ Makefile	23 Nov 2015 17:04:16 -
@@ -2,8 +2,7 @@
 
 COMMENT=	command-line utility to rip and encode audio cds
 
-DISTNAME=	abcde-2.5.4
-REVISION=	1
+DISTNAME=	abcde-2.7.1
 CATEGORIES=	audio
 
 HOMEPAGE=	http://abcde.einval.com/
Index: distinfo
===
RCS file: /cvs/ports/audio/abcde/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo	2 Mar 2013 13:03:17 -	1.9
+++ distinfo	23 Nov 2015 17:04:16 -
@@ -1,2 +1,2 @@
-SHA256 (abcde-2.5.4.tar.gz) = hbZ5uXDnKKmGSHrcv/fFHrDnL5+hDERQUh+OAp+m5ZE=
-SIZE (abcde-2.5.4.tar.gz) = 104229
+SHA256 (abcde-2.7.1.tar.gz) = NAHjl4WyDt7oQ9TYdbR9K1WfdkaBxILESRqMi6YF8lA=
+SIZE (abcde-2.7.1.tar.gz) = 144302
Index: patches/patch-abcde
===
RCS file: /cvs/ports/audio/abcde/patches/patch-abcde,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-abcde
--- patches/patch-abcde	21 Nov 2012 20:38:48 -	1.7
+++ patches/patch-abcde	23 Nov 2015 17:04:16 -
@@ -1,14 +1,13 @@
-$OpenBSD: patch-abcde,v 1.7 2012/11/21 20:38:48 sthen Exp $
 abcde.orig	Tue Sep 18 15:09:31 2012
-+++ abcde	Sat Nov 17 16:09:52 2012
+--- abcde.orig	Sun Oct  4 11:30:28 2015
 abcde	Thu Oct 22 15:51:49 2015
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!${LOCALBASE}/bin/bash
  # Copyright (c) 1998-2001 Robert Woodcock 
  # Copyright (c) 2003-2006 Jesus Climent 
  # Copyright (c) 2009-2012 Colin Tuckley 
-@@ -833,6 +833,16 @@ do_tag ()
- 		${TPE2:+--set-text-frame=TPE2:"$TPE2"} \
+@@ -839,6 +839,16 @@
+ 		${TPE2:+--TPE2 "$TPE2"} \
  		"$ABCDETEMPDIR/track$1.$OUTPUT"
  	;;
 +id3tag)
@@ -21,56 +20,55 @@ $OpenBSD: patch-abcde,v 1.7 2012/11/21 2
 +		${TRACKNUM:+-T "$TRACKS"} \
 +		"$ABCDETEMPDIR/track$1.$OUTPUT"
 +	;;
- # FIXME # Still not activated...
- id3ed)
- 	run_command tagtrack-$OUTPUT-$1 nice $ENCNICE \
-@@ -3165,7 +3175,7 @@ VAPLAYLISTFORMAT='${ARTISTFILE}-${ALBUMFILE}.${OUTPUT}
+ eyed3*)
+ 	# FIXME # track numbers in mp3 come with 1/10, so we cannot
+ 	# happily substitute them with $TRACKNUM
+@@ -3471,7 +3481,7 @@
  VAPLAYLISTDATAPREFIX=''
  DOSPLAYLIST=n
  COMMENT=''
--ID3TAGV=2
+-ID3TAGV=id3v2.4
 +ID3TAGV=id3tag
  ENCNICE=10
  READNICE=10
  DISTMP3NICE=10
-@@ -3207,6 +3217,7 @@ AACENC=faac
- 
+@@ -3537,6 +3547,7 @@
  ID3=id3
  ID3V2=id3v2
+ MID3V2=mid3v2
 +ID3TAG=id3tag
  EYED3=eyeD3
  VORBISCOMMENT=vorbiscomment
  METAFLAC=metaflac
-@@ -3259,6 +3270,7 @@ AACENCOPTS=
+@@ -3621,6 +3632,7 @@
+ FFMPEGENCOPTS=
  
  ID3OPTS=
- ID3V2OPTS=
 +ID3TAGOPTS=
+ EYED3OPTS=""
+ ATOMICPARSLEYOPTS=
  CDPARANOIAOPTS=
- CDDA2WAVOPTS=
- DAGRABOPTS=
-@@ -3310,7 +3322,7 @@ elif [ X$(uname) = "XDarwin" ] ; then
- 	NEEDDISKUTIL=y
- 	CDROMREADERSYNTAX=cddafs
+@@ -3683,7 +3695,7 @@
+ 	# We won't find the eject program in OSX, and doing checkexec will fail further below...
+ 	unset EJECT
  elif [ X$(uname) = "XOpenBSD" ] ; then
 -	HTTPGET=wget
 +	HTTPGET=ftp
  	MD5SUM=md5
  	OSFLAVOUR=OBSD
  elif [ X$(uname) = "XNetBSD" ] ; then
-@@ -3875,11 +3887,15 @@ esac
- if [ "$ID3TAGV" = "1" ]; then
- 	TAGGER="$ID3"
- 	TAGGEROPTS="$ID3OPTS"
-+else if [ "$ID3TAGV" = "id3tag" ]; then
-+	TAGGER="$ID3TAG"
-+	TAGGEROPTS="$ID3TAGOPTS"
- else
- 	TAGGER="$EYED3"
- 	TAGGEROPTS="$ID3V2OPTS"
- 	ID3SYNTAX=eyed3
- 	TAGGEROPTS="--set-encoding=utf16-LE $ID3V2OPTS"
-+fi
- fi
- 
- # NOGAP is specific to lame. Other encoders fail ...
+@@ -4427,8 +4439,13 @@
+ 			TAGGEROPTS="--encoding utf16 $EYED3OPTS"
+ 		fi
+ 		;;
++	id3tag)
++		TAGGER="$ID3TAG"
++		ID3SYNTAX=id3tag
++		TAGGEROPTS="$ID3TAGOPTS"
++		;;
+ 	*)
+-		log error "Error: ID3TAGV must be either \"id3v1\", \"id3v2.3\" or \"id3v2.4\""
++		log error "Error: ID3TAGV must be either \"id3v1\", \"id3v2.3\", \"id3v2.4\" or \"id3tag\""
+ 		exit 1
+ 		;;
+ esac

Re: update net/tor

[Pascal Stumpf]

On Mon, 23 Nov 2015 09:42:10 +0100, Daniel Jakots wrote:
> Hi,
> 
> Tor 0.2.7.5 is now released. You can see the changelog in the announce
> [1].
> 
> In "new system requirements":
> - Tor no longer includes workarounds to support Libevent versions
>   before 1.3e. Libevent 2.0 or later is recommended. Closes
>   ticket 15248.
> 
> I didn't change anything with that, I let Pascal choose.
> 
> [1]: 
> https://lists.torproject.org/pipermail/tor-announce/2015-November/000103.html
> 
> Cheers,
> Daniel
> 

Yes, I think the port should switch to libevent2 per default.  It still
works with 1.4, but "2.0 is recommended" is pretty clear.


Index: Makefile
===
RCS file: /cvs/ports/net/tor/Makefile,v
retrieving revision 1.86
diff -u -p -r1.86 Makefile
--- Makefile20 Jul 2015 19:55:58 -  1.86
+++ Makefile23 Nov 2015 17:44:57 -
@@ -2,27 +2,29 @@
 
 COMMENT=   anonymity service using onion routing
 
-DISTNAME=  tor-0.2.6.10
+DISTNAME=  tor-0.2.7.5
 CATEGORIES=net
 HOMEPAGE=  https://www.torproject.org/
-REVISION=  1
 
 MAINTAINER=Pascal Stumpf 
 
 # BSD
 PERMIT_PACKAGE_CDROM=  Yes
 
-WANTLIB += c crypto event m pthread ssl z
+WANTLIB += c crypto event_core event_extra m pthread ssl z
 
 MASTER_SITES=  https://www.torproject.org/dist/
 
-CONFIGURE_STYLE=gnu
+CONFIGURE_STYLE=autoconf
 AUTOCONF_VERSION = 2.69
 # PIE is already taken care of on a per-arch basis, and we have stack 
protection
 # anyway on FRAME_GROWS_DOWN archs.
 CONFIGURE_ARGS=--with-ssl-dir=/usr \
+   --with-libevent-dir="${LOCALBASE}" \
--disable-gcc-hardening
 CONFIGURE_ENV+=ac_cv_member_struct_ssl_method_st_get_cipher_by_char=no
+
+LIB_DEPENDS=   devel/libevent2
 
 DB_DIR=/var/tor
 SUBST_VARS+=   DB_DIR
Index: distinfo
===
RCS file: /cvs/ports/net/tor/distinfo,v
retrieving revision 1.70
diff -u -p -r1.70 distinfo
--- distinfo14 Jul 2015 12:05:44 -  1.70
+++ distinfo23 Nov 2015 17:44:57 -
@@ -1,2 +1,2 @@
-SHA256 (tor-0.2.6.10.tar.gz) = BULA7+Q7hmGTN4Yvp+sCx6dMsjp51YcJBiil8PEiS40=
-SIZE (tor-0.2.6.10.tar.gz) = 3587211
+SHA256 (tor-0.2.7.5.tar.gz) = fSqeTbG9md64OVYJtZysIXsMHun/LusPCIuRpdj2ql8=
+SIZE (tor-0.2.7.5.tar.gz) = 4838541
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_in   23 Nov 2015 17:44:57 -
@@ -0,0 +1,29 @@
+$OpenBSD$
+--- Makefile.in.orig   Fri Nov 20 19:46:55 2015
 Makefile.inFri Nov 20 19:47:27 2015
+@@ -6768,8 +6768,8 @@ uninstall-man: uninstall-man1
+ src/common/log.o: micro-revision.i
+ 
+ src/or/tor_main.o: micro-revision.i
+-@COVERAGE_ENABLED_TRUE@export 
TESTING_TOR_BINARY=$(top_builddir)/src/or/tor-cov
+-@COVERAGE_ENABLED_FALSE@export TESTING_TOR_BINARY=$(top_builddir)/src/or/tor
++@COVERAGE_ENABLED_TRUE@TESTING_TOR_BINARY=$(top_builddir)/src/or/tor-cov
++@COVERAGE_ENABLED_FALSE@TESTING_TOR_BINARY=$(top_builddir)/src/or/tor
+ 
+ micro-revision.i: FORCE
+   $(AM_V_at)rm -f micro-revision.tmp; \
+@@ -6791,10 +6791,10 @@ micro-revision.i: FORCE
+ 
+ FORCE:
+ 
+-export PYTHON=@PYTHON@
+-export SHELL=@SHELL@
+-export abs_top_srcdir=@abs_top_srcdir@
+-export builddir=@builddir@
++PYTHON=@PYTHON@
++SHELL=@SHELL@
++abs_top_srcdir=@abs_top_srcdir@
++builddir=@builddir@
+ # fallback_consensus
+ 
+ # If we don't have it, fake it.
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-configure_ac  23 Nov 2015 17:44:57 -
@@ -0,0 +1,44 @@
+$OpenBSD$
+
+Make this work w/ libevent2 on OpenBSD
+https://trac.torproject.org/projects/tor/attachment/ticket/16651/event2-b.patch
+
+--- configure.ac.orig  Fri Nov 13 14:41:42 2015
 configure.ac   Mon Nov 23 18:38:05 2015
+@@ -505,10 +505,7 @@ AC_CHECK_MEMBERS([struct event.min_heap_idx], , ,
+ AC_CHECK_HEADERS(event2/event.h event2/dns.h event2/bufferevent_ssl.h)
+ 
+ LIBS="$save_LIBS"
+-LDFLAGS="$save_LDFLAGS"
+-CPPFLAGS="$save_CPPFLAGS"
+ 
+-
+ AM_CONDITIONAL(USE_EXTERNAL_EVDNS, test x$ac_cv_header_event2_dns_h = xyes)
+ 
+ if test "$enable_static_libevent" = "yes"; then
+@@ -518,8 +515,24 @@ if test "$enable_static_libevent" = "yes"; then
+  TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/libevent.a 
$STATIC_LIBEVENT_FLAGS"
+fi
+ else
+- TOR_LIBEVENT_LIBS="-levent"
++ if test x$ac_cv_header_event2_event_h = "xyes"; then
++   AC_SEARCH_LIBS(event_new, [event event_core])
++   AC_SEARCH_LIBS(evdns_base_new, [event event_extra])
++
++   if test $ac_cv_search_event_new != "none required"; then
++ 

Re: [Fwd: [PATCH] pledge x11/wmii (and other ports?)]

[Christian Weisgerber]

On 2015-11-22, "trondd"  wrote:

> I haven't seen much discussion about applying pledge to ports, so I
> thought I'd
> find out how people feel about it.

Reluctant. Very reluctant.

You may remember that by and large we stopped adding strl* patches
to ports, because they become a maintenance burden when not accepted
upstream and there is a real risk of introducing bugs.

I am very worried about people sprinkling pledge() over ports with
the result that programs die with pledge violations when a user
runs the program slightly differently than the maintainer.  We have
added pledge() to a few popular decompressors because these are a
potential attack vector against the package building machines, and
it took sthen@ and me three attempts to get right an ostensibly
simple program like xz.

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

Build error: devel/avr/gcc

[Christian Weisgerber]

Latest build failure on amd64.  I have no idea.

-
>>> Building on localhost under devel/avr/gcc
 BDEPENDS = 
[archivers/bzip2;devel/gmake;devel/bison;devel/mpfr;devel/gmp;devel/autoconf/2.13;devel/metaauto;devel/avr/binutils]
 DIST = 
[devel/avr/gcc:gcc/gcc-core-4.3.4.tar.bz2;devel/avr/gcc:gcc/gcc-g++-4.3.4.tar.bz2]
 FULLPKGNAME = avr-gcc-4.3.4p1
 RDEPENDS = [devel/gmp;devel/mpfr]
(Junk lock obtained for localhost at 1448297335)
>>> Running depends in devel/avr/gcc at 1448297335
   last junk was in www/netsurf/buildsystem
/usr/sbin/pkg_add -aI -Dunsigned -Drepair autoconf-2.13p3 avr-binutils-2.20p2 
gmp-5.0.2p3 metaauto-1.0p1 mpfr-3.1.0.3p0
was: /usr/sbin/pkg_add -aI -Dunsigned -Drepair autoconf-2.13p3 
avr-binutils-2.20p2 bison-3.0.4 bzip2-1.0.6p7 gmake-4.1p0 gmp-5.0.2p3 
metaauto-1.0p1 mpfr-3.1.0.3p0
/usr/sbin/pkg_add -aI -Dunsigned -Drepair autoconf-2.13p3 avr-binutils-2.20p2 
gmp-5.0.2p3 metaauto-1.0p1 mpfr-3.1.0.3p0
>>> Running show-prepare-results in devel/avr/gcc at 1448297338
===> devel/avr/gcc
===> avr-gcc-4.3.4p1 depends on: autoconf-2.13 -> autoconf-2.13p3
===> avr-gcc-4.3.4p1 depends on: bison-* -> bison-3.0.4
===> avr-gcc-4.3.4p1 depends on: metaauto-* -> metaauto-1.0p1
===> avr-gcc-4.3.4p1 depends on: avr-binutils-* -> avr-binutils-2.20p2
===> avr-gcc-4.3.4p1 depends on: gmake-* -> gmake-4.1p0
===> avr-gcc-4.3.4p1 depends on: bzip2-* -> bzip2-1.0.6p7
===> avr-gcc-4.3.4p1 depends on: gmp->=4.2 -> gmp-5.0.2p3
===> avr-gcc-4.3.4p1 depends on: mpfr-* -> mpfr-3.1.0.3p0
===>  Verifying specs:  c gmp mpfr
===>  found c.84.2 gmp.9.0 mpfr.1.1
autoconf-2.13p3
avr-binutils-2.20p2
bison-3.0.4
bzip2-1.0.6p7
gmake-4.1p0
gmp-5.0.2p3
metaauto-1.0p1
mpfr-3.1.0.3p0
Still tainted: 1
>>> Running junk in devel/avr/gcc at 1448297340
Can't run junk because of lock on graphics/mapnik
(Junk lock released for localhost at 1448297341)
distfiles size=29952373
>>> Running patch in devel/avr/gcc at 1448297341
===> devel/avr/gcc
===>  Checking files for avr-gcc-4.3.4p1
`/usr/ports/distfiles/gcc/gcc-core-4.3.4.tar.bz2' is up to date.
`/usr/ports/distfiles/gcc/gcc-g++-4.3.4.tar.bz2' is up to date.
===>  Extracting for avr-gcc-4.3.4p1
===>  Patching for avr-gcc-4.3.4p1
>>> Running configure in devel/avr/gcc at 1448297351
===> devel/avr/gcc
===>  Configuring for avr-gcc-4.3.4p1
Using /usr/obj/ports/avr-gcc-4.3.4/config.site (generated)
configure: loading site script /usr/obj/ports/avr-gcc-4.3.4/config.site
checking build system type... x86_64-unknown-openbsd5.8
checking host system type... x86_64-unknown-openbsd5.8
checking target system type... avr-unknown-none
checking for a BSD-compatible install... install -c
checking whether ln works... yes
checking whether ln -s works... yes
checking for gcc... cc
checking for C compiler default output file name... a.out
checking whether the C compiler works... yes
checking whether we are cross compiling... no
checking for suffix of executables... 
checking for suffix of object files... (cached) o
checking whether we are using the GNU C compiler... (cached) yes
checking whether cc accepts -g... (cached) yes
checking for cc option to accept ANSI C... none needed
checking whether we are using the GNU C++ compiler... (cached) yes
checking whether c++ accepts -g... (cached) yes
checking for gnatbind... no
checking for gnatmake... no
checking whether compiler driver understands Ada... no
checking how to compare bootstrapped objects... cmp $$f1 $$f2 16 16
checking for correct version of gmp.h... yes
checking for correct version of mpfr.h... yes
*** This configuration is not supported in the following subdirectories:
 target-libmudflap target-libgomp target-libiberty target-libstdc++-v3 
target-libssp
(Any other directories should still work fine.)
checking for bison... bison
checking for bison... bison
checking for gm4... gm4
checking for flex... (cached) flex
checking for flex... flex
checking for makeinfo... makeinfo
checking for expect... expect
checking for runtest... no
checking for ar... ar
checking for as... as
checking for dlltool... no
checking for ld... ld
checking for lipo... no
checking for nm... nm
checking for ranlib... ranlib
checking for strip... strip
checking for windres... no
checking for windmc... no
checking for objcopy... objcopy
checking for objdump... objdump
checking for avr-cc... no
checking for avr-gcc... no
checking for avr-c++... no
checking for avr-g++... no
checking for avr-cxx... no
checking for avr-gxx... no
checking for avr-gcc... no
checking for avr-gcj... no
checking for avr-gfortran... no
checking for ar... /usr/local/avr/bin/ar
checking for as... /usr/local/avr/bin/as
checking for dlltool... no
checking for avr-dlltool... no
checking for ld... /usr/local/avr/bin/ld
checking for lipo... no
checking for avr-lipo... no
checking for nm... /usr/local/avr/bin/nm
checking for objdump... /usr/local/avr/bin/objdump
checking for ranlib... /usr/local/avr/bin/ranlib
checking for strip... 

Build Qt5 subpackage

[Vadim Zhukov]

Hello, Matthias and all!

This patch adds Qt5 support to poppler, resulting in one more
subpackage (guess it's name!) and a few more hunks to the patch
for configure script. 

I need this for KDE Frameworks (i.e., KDE5 core libraries). Tested
on amd64 for a few releases of poppler already.

Okay?

--
WBR,
  Vadim Zhukov

P.S.: I've spelled "Qt5" in COMMENT-qt5 correctly and I want to fix
COMMENT-qt and COMMENT-qt4 as well in a separate commit. :)


Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.99
diff -u -p -r1.99 Makefile
--- Makefile20 Nov 2015 07:47:44 -  1.99
+++ Makefile23 Nov 2015 20:35:09 -
@@ -3,6 +3,7 @@
 COMMENT-main=  PDF rendering library
 COMMENT-qt=qt interface to PDF rendering library
 COMMENT-qt4=   qt4 interface to PDF rendering library
+COMMENT-qt5=   Qt5 interface to PDF rendering library
 COMMENT-utils= PDF conversion tools and utilities
 
 V= 0.38.0
@@ -12,12 +13,14 @@ PKGNAME-main=   poppler-$V
 PKGNAME-utils= poppler-utils-$V
 PKGNAME-qt=poppler-qt-$V
 PKGNAME-qt4=   poppler-qt4-$V
+PKGNAME-qt5=   poppler-qt5-$V
 OLDSHIT =  poppler-0.16.7
 
 SHARED_LIBS += poppler  33.0 # 57.0
 SHARED_LIBS += poppler-glib 14.0 # 15.0
 SHARED_LIBS += poppler-qt   12.0 # 3.0
 SHARED_LIBS += poppler-qt4  18.0 # 13.0
+SHARED_LIBS += poppler-qt5  0.0  # 10.0
 SHARED_LIBS += poppler-cpp  6.1  # 2.1
 
 DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
@@ -31,13 +34,14 @@ PERMIT_PACKAGE_CDROM=   Yes
 
 MASTER_SITES=  ${HOMEPAGE}
 
-PSEUDO_FLAVORS=no_qt no_qt4 bootstrap
+PSEUDO_FLAVORS=no_qt no_qt4 no_qt5 bootstrap
 # XXX not strictly a bootstrap loop, but on the critical path for libreoffice
-FLAVOR?=no_qt no_qt4 bootstrap
+FLAVOR?=no_qt no_qt4 no_qt5 bootstrap
 
 NOT_FOR_ARCHS-qt4 = arm
+NOT_FOR_ARCHS-qt5 = arm
 
-MULTI_PACKAGES=-main -qt -qt4 -utils
+MULTI_PACKAGES=-main -qt -qt4 -qt5 -utils
 
 .include 
 
@@ -55,8 +59,11 @@ MODULES+=x11/qt4
 CONFIGURE_ARGS+=   --disable-poppler-qt4
 .endif
 
-# until Qt5 is enabled
+.if ${BUILD_PACKAGES:M-qt5}
+MODULES+=  x11/qt5
+.else
 CONFIGURE_ARGS+=   --disable-poppler-qt5
+.endif
 
 MODULES+=  devel/gettext
 
@@ -79,6 +86,9 @@ LIB_DEPENDS-qt=   ${MODQT3_LIB_DEPENDS} \
 LIB_DEPENDS-qt4=${MODQT4_LIB_DEPENDS} \
print/poppler
 
+LIB_DEPENDS-qt5=${MODQT5_LIB_DEPENDS} \
+   print/poppler
+
 LIB_DEPENDS-utils= print/poppler
 
 WANTLIB-main=  ${cWANTLIB} Xext ffi gio-2.0 glib-2.0 gmodule-2.0 \
@@ -91,6 +101,12 @@ WANTLIB-qt4=${cWANTLIB} ${MODQT4_WAN
SM X11 Xext Xi Xinerama Xrender ffi glib-2.0 \
gobject-2.0 gthread-2.0 iconv intl lcms2 openjpeg \
png poppler pcre pthread-stubs xcb
+WANTLIB-qt5=   ${cWANTLIB} ${MODQT5_WANTLIB} ${MODGCC4_CPPWANTLIB} \
+   GL Qt5Core Qt5Gui Qt5Widgets Qt5Xml X11 X11-xcb Xau \
+   Xdamage Xdmcp Xext Xfixes Xxf86vm drm execinfo ffi glapi \
+   glib-2.0 gobject-2.0 gthread-2.0 iconv icudata icui18n \
+   icuuc intl lcms2 openjpeg pcre pcre16 png poppler \
+   pthread-stubs xcb xcb-dri2 xcb-glx
 WANTLIB-utils= X11 Xext Xrender c cairo fontconfig lcms2 m pixman-1 \
png pthread-stubs xcb xcb-render xcb-shm openjpeg \
poppler z ${cWANTLIB}
@@ -105,10 +121,19 @@ CONFIGURE_ARGS+=--enable-xpdf-headers \
 
 CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
-   LIBJPEG_CFLAGS="-I${LOCALBASE}/include"
+   LIBJPEG_CFLAGS="-I${LOCALBASE}/include" \
+   ac_cv_prog_MOCQT4=${MODQT4_MOC} \
+   ac_cv_prog_MOCQT5=${MODQT5_MOC}
 
 USE_GMAKE= Yes
 
+MAIN_CC=   /usr/bin/cc
+MAIN_CXX=  /usr/bin/c++
+.if "${USE_CCACHE:L}" == "yes"
+MAIN_CC:=  ccache ${MAIN_CC}
+MAIN_CXX:= ccache ${MAIN_CXX}
+.endif
+
 post-extract:
cd ${WRKDIST} && \
for i in poppler-qt-uninstalled.pc.in poppler-qt.pc.cmake \
@@ -117,5 +142,12 @@ post-extract:
done; \
ln -sf ../../${OLDSHIT}/m4/qt.m4 m4/qt.m4
cd ${WRKDIST} && cp -R ../${OLDSHIT}/qt qt
+
+post-configure:
+   find ${WRKBUILD} -name Makefile \! -path '*/qt5/*' -print0 | xargs -0 \
+   perl -pi -e 's,^CC = \S+,CC = ${MAIN_CC},;' \
+-e's,^CPP = \S+,CPP = ${MAIN_CC},;' \
+-e's,^CXX = \S+,CXX = ${MAIN_CXX},;' \
+-e 's,^CXXCPP = \S+,CXXCPP = ${MAIN_CXX},;'
 
 .include 
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v
retrieving revision 1.14
diff -u -p -r1.14 patch-configure_ac
--- patches/patch-configure_ac  14 

Re: Build error: devel/avr/gcc

[Nigel Taylor]

On 11/23/15 21:03, Christian Weisgerber wrote:
> Latest build failure on amd64.  I have no idea.
> 
> -
 Building on localhost under devel/avr/gcc
>BDEPENDS = 
> [archivers/bzip2;devel/gmake;devel/bison;devel/mpfr;devel/gmp;devel/autoconf/2.13;devel/metaauto;devel/avr/binutils]
>DIST = 
> [devel/avr/gcc:gcc/gcc-core-4.3.4.tar.bz2;devel/avr/gcc:gcc/gcc-g++-4.3.4.tar.bz2]
>FULLPKGNAME = avr-gcc-4.3.4p1
>RDEPENDS = [devel/gmp;devel/mpfr]
> (Junk lock obtained for localhost at 1448297335)
 Running depends in devel/avr/gcc at 1448297335
>last junk was in www/netsurf/buildsystem
> /usr/sbin/pkg_add -aI -Dunsigned -Drepair autoconf-2.13p3 avr-binutils-2.20p2 
> gmp-5.0.2p3 metaauto-1.0p1 mpfr-3.1.0.3p0
> was: /usr/sbin/pkg_add -aI -Dunsigned -Drepair autoconf-2.13p3 
> avr-binutils-2.20p2 bison-3.0.4 bzip2-1.0.6p7 gmake-4.1p0 gmp-5.0.2p3 
> metaauto-1.0p1 mpfr-3.1.0.3p0
> /usr/sbin/pkg_add -aI -Dunsigned -Drepair autoconf-2.13p3 avr-binutils-2.20p2 
> gmp-5.0.2p3 metaauto-1.0p1 mpfr-3.1.0.3p0
 Running show-prepare-results in devel/avr/gcc at 1448297338
> ===> devel/avr/gcc
> ===> avr-gcc-4.3.4p1 depends on: autoconf-2.13 -> autoconf-2.13p3
> ===> avr-gcc-4.3.4p1 depends on: bison-* -> bison-3.0.4
> ===> avr-gcc-4.3.4p1 depends on: metaauto-* -> metaauto-1.0p1
> ===> avr-gcc-4.3.4p1 depends on: avr-binutils-* -> avr-binutils-2.20p2
> ===> avr-gcc-4.3.4p1 depends on: gmake-* -> gmake-4.1p0
> ===> avr-gcc-4.3.4p1 depends on: bzip2-* -> bzip2-1.0.6p7
> ===> avr-gcc-4.3.4p1 depends on: gmp->=4.2 -> gmp-5.0.2p3
> ===> avr-gcc-4.3.4p1 depends on: mpfr-* -> mpfr-3.1.0.3p0
> ===>  Verifying specs:  c gmp mpfr
> ===>  found c.84.2 gmp.9.0 mpfr.1.1
> autoconf-2.13p3
> avr-binutils-2.20p2
> bison-3.0.4
> bzip2-1.0.6p7
> gmake-4.1p0
> gmp-5.0.2p3
> metaauto-1.0p1
> mpfr-3.1.0.3p0
> Still tainted: 1
 Running junk in devel/avr/gcc at 1448297340
> Can't run junk because of lock on graphics/mapnik
> (Junk lock released for localhost at 1448297341)
> distfiles size=29952373
 Running patch in devel/avr/gcc at 1448297341
> ===> devel/avr/gcc
> ===>  Checking files for avr-gcc-4.3.4p1
> `/usr/ports/distfiles/gcc/gcc-core-4.3.4.tar.bz2' is up to date.
> `/usr/ports/distfiles/gcc/gcc-g++-4.3.4.tar.bz2' is up to date.
> ===>  Extracting for avr-gcc-4.3.4p1
> ===>  Patching for avr-gcc-4.3.4p1
 Running configure in devel/avr/gcc at 1448297351
> ===> devel/avr/gcc
> ===>  Configuring for avr-gcc-4.3.4p1
> Using /usr/obj/ports/avr-gcc-4.3.4/config.site (generated)
> configure: loading site script /usr/obj/ports/avr-gcc-4.3.4/config.site
> checking build system type... x86_64-unknown-openbsd5.8
> checking host system type... x86_64-unknown-openbsd5.8
> checking target system type... avr-unknown-none
> checking for a BSD-compatible install... install -c
> checking whether ln works... yes
> checking whether ln -s works... yes
> checking for gcc... cc
> checking for C compiler default output file name... a.out
> checking whether the C compiler works... yes
> checking whether we are cross compiling... no
> checking for suffix of executables... 
> checking for suffix of object files... (cached) o
> checking whether we are using the GNU C compiler... (cached) yes
> checking whether cc accepts -g... (cached) yes
> checking for cc option to accept ANSI C... none needed
> checking whether we are using the GNU C++ compiler... (cached) yes
> checking whether c++ accepts -g... (cached) yes
> checking for gnatbind... no
> checking for gnatmake... no
> checking whether compiler driver understands Ada... no
> checking how to compare bootstrapped objects... cmp $$f1 $$f2 16 16
> checking for correct version of gmp.h... yes
> checking for correct version of mpfr.h... yes
> *** This configuration is not supported in the following subdirectories:
>  target-libmudflap target-libgomp target-libiberty target-libstdc++-v3 
> target-libssp
> (Any other directories should still work fine.)
> checking for bison... bison
> checking for bison... bison
> checking for gm4... gm4
> checking for flex... (cached) flex
> checking for flex... flex
> checking for makeinfo... makeinfo
> checking for expect... expect
> checking for runtest... no
> checking for ar... ar
> checking for as... as
> checking for dlltool... no
> checking for ld... ld
> checking for lipo... no
> checking for nm... nm
> checking for ranlib... ranlib
> checking for strip... strip
> checking for windres... no
> checking for windmc... no
> checking for objcopy... objcopy
> checking for objdump... objdump
> checking for avr-cc... no
> checking for avr-gcc... no
> checking for avr-c++... no
> checking for avr-g++... no
> checking for avr-cxx... no
> checking for avr-gxx... no
> checking for avr-gcc... no
> checking for avr-gcj... no
> checking for avr-gfortran... no
> checking for ar... /usr/local/avr/bin/ar
> checking for as... /usr/local/avr/bin/as
> checking for dlltool... no
> checking for avr-dlltool... no