[update] ecl-16.1.2

[Timo Myyrä]

Hi,

Here is an update for latest version of ECL.
Seems that the Copyright file got renamed to LICENSE but Makefiles didn't get
updated for the release so this adds backports few patches to fix it.

Tested lightly on amd64, runs maxima test suite without errors.

Timo


Index: Makefile
===
RCS file: /cvs/ports/lang/ecl/Makefile,v
retrieving revision 1.27
diff -u -u -p -r1.27 Makefile
--- Makefile25 Jan 2016 19:52:07 -  1.27
+++ Makefile8 Mar 2016 05:06:56 -
@@ -7,9 +7,9 @@ BROKEN-mips64 = ecl_min fails
 BROKEN-sparc = infinite loop while building
 BROKEN-arm =   infinite loop while building
 
-V =16.0.0
+V =16.1.2
 DISTNAME = ecl-$V
-SHARED_LIBS += ecl 4.0
+SHARED_LIBS += ecl 5.0
 SHARED_ONLY =  Yes
 
 HOMEPAGE = https://common-lisp.net/project/ecl/
@@ -20,7 +20,7 @@ EXTRACT_SUFX =.tgz
 # GPLv2 or later
 PERMIT_PACKAGE_CDROM = Yes
 
-MASTER_SITES = ${HOMEPAGE}files/
+MASTER_SITES = ${HOMEPAGE}files/release/${V}/
 
 CONFIGURE_STYLE =  gnu
 TEST_TARGET =  check
Index: distinfo
===
RCS file: /cvs/ports/lang/ecl/distinfo,v
retrieving revision 1.7
diff -u -u -p -r1.7 distinfo
--- distinfo29 Aug 2015 14:48:34 -  1.7
+++ distinfo8 Mar 2016 05:06:56 -
@@ -1,2 +1,2 @@
-SHA256 (ecl-16.0.0.tgz) = ND7Uw+SQZWJ1emA5uFzhbTPdXoAB10AEk2eVmD468DM=
-SIZE (ecl-16.0.0.tgz) = 8009304
+SHA256 (ecl-16.1.2.tgz) = LUgrGgpPvV2IFDRRcDInnYCMtkBeIt2R721zNTRGS5k=
+SIZE (ecl-16.1.2.tgz) = 7449461
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   8 Mar 2016 05:06:56 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- Makefile.in.orig   Tue Mar  8 06:41:52 2016
 Makefile.inTue Mar  8 06:42:29 2016
+@@ -50,7 +50,7 @@ mandir=@mandir@
+ libdir=@libdir@
+ 
+ #  What to release
+-TAR_CONTENTS=Makefile.in README.1st LGPL ANNOUNCEMENT Copyright doc \
++TAR_CONTENTS=Makefile.in README.md LGPL ANNOUNCEMENT LICENSE doc \
+   configure src/c src/cmp src/clos src/CHANGELOG src/lsp src/doc \
+   src/h  src/gmp src/config* src/install.sh src/Makefile.in \
+   src/util contrib/ src/clx src/gc src/*.in src/*.m4 src/gabriel \
Index: patches/patch-src_Makefile_in
===
RCS file: /cvs/ports/lang/ecl/patches/patch-src_Makefile_in,v
retrieving revision 1.5
diff -u -u -p -r1.5 patch-src_Makefile_in
--- patches/patch-src_Makefile_in   29 Aug 2015 14:48:34 -  1.5
+++ patches/patch-src_Makefile_in   8 Mar 2016 05:06:56 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_Makefile_in,v 1.5 2015/08/29 14:48:34 jasper Exp $
 src/Makefile.in.orig   Mon Aug 24 15:25:08 2015
-+++ src/Makefile.inMon Aug 24 15:28:43 2015
-@@ -173,30 +173,15 @@ install:
+--- src/Makefile.in.orig   Thu Feb 25 09:06:19 2016
 src/Makefile.inTue Mar  8 06:43:19 2016
+@@ -176,34 +176,19 @@ install:
done
$(RM) -f $(DESTDIR)$(includedir)/ecl/config.h
mv $(DESTDIR)$(includedir)/ecl/config-install.h 
$(DESTDIR)$(includedir)/ecl/config.h
@@ -36,3 +36,17 @@ $OpenBSD: patch-src_Makefile_in,v 1.5 20
*) $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir);; \
  esac \
done
+-  for i in Copyright LGPL; do \
++  for i in LICENSE LGPL; do \
+ $(INSTALL_DATA) $(top_srcdir)/../$$i $(DESTDIR)$(ecldir); \
+   done
+   $(mkinstalldirs) $(DESTDIR)$(mandir)/man$(manext)
+@@ -217,7 +202,7 @@ flatinstall: build-stamp
+ uninstall:
+   for i in $(TARGETS) ecl-config; do $(RM) $(DESTDIR)$(bindir)/$$i; done
+   $(RM) -r $(DESTDIR)$(includedir)/ecl $(DESTDIR)$(ecldir)
+-  for i in $(LSP_LIBRARIES) $(LIBRARIES) Copyright LGPL; do \
++  for i in $(LSP_LIBRARIES) $(LIBRARIES) LICENSE LGPL; do \
+ $(RM) $(DESTDIR)$(libdir)/$$i || : ; \
+   done
+   $(RM) -f $(DESTDIR)$(mandir)/man$(manext)/ecl.$(manext)
Index: patches/patch-src_compile_lsp_in
===
RCS file: /cvs/ports/lang/ecl/patches/patch-src_compile_lsp_in,v
retrieving revision 1.3
diff -u -u -p -r1.3 patch-src_compile_lsp_in
--- patches/patch-src_compile_lsp_in29 Aug 2015 14:48:34 -  1.3
+++ patches/patch-src_compile_lsp_in8 Mar 2016 05:06:56 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_compile_lsp_in,v 1.3 2015/08/29 14:48:34 jasper Exp $
 src/compile.lsp.in.origMon Aug 24 15:32:27 2015
-+++ src/compile.lsp.in Mon Aug 24 15:35:06 2015
-@@ -71,19 +71,19 @@
+--- src/compile.lsp.in.origThu Feb 25 09:06:19 2016
 src/compile.lsp.in Tue Mar  8 06:41:44 2016
+@@ -74,19 +74,19 @@
"@LDFLAGS@ @LIBPREFIX@ecl.@LIBEXT@ @CORE_LIBS@ @FASL_LIBS@ @LIBS@")
  

new: converters/p5-Cpanel-JSON-XS

[Abel Abraham Camarillo Ojeda]

hi ports:

this seems to be the recommended module to interact with
p5-Mojolicious these days:

This module converts Perl data structures to JSON and vice versa. Its
primary goal is to be correct and its secondary goal is to be fast. To
reach the latter goal it was written in C.

As this is the n-th-something JSON module on CPAN, what was the reason
to write yet another JSON module? While it seems there are many JSON
modules, none of them correctly handle all corner cases, and in most
cases their maintainers are unresponsive, gone missing, or not listening
to bug reports for other reasons.


also, update-plist generates this entries:

${P5ARCH}/auto/
${P5ARCH}/auto/Cpanel/
${P5ARCH}/auto/Cpanel/JSON/
${P5ARCH}/auto/Cpanel/JSON/XS/

(no files on any directory), what is the usual thing to do about this?

tgz attached

comments?, make test ok on amd64

thanks


p5-Cpanel-JSON-XS.tgz
Description: GNU Zip compressed data

new: devel/p5-Mojolicious-Plugin-NYTProf

[Abel Abraham Camarillo Ojeda]

hi ports

This plugin enables Mojolicious to automatically generate Devel::NYTProf
profiles and routes for your app

tgz attached

also, note PLIST:

@comment $OpenBSD$
${P5SITE}/Mojolicious/Plugin/NYTProf.pm
${P5SITE}/Mojolicious/Plugin/README.pod
@man man/man3p/Mojolicious::Plugin::NYTProf.3p
@man man/man3p/Mojolicious::Plugin::README.3p


what is commonly done with these README files?

thanks.


p5-Mojolicious-Plugin-NYTProf.tgz
Description: GNU Zip compressed data

new: p5-Mojo-JSON-MaybeXS

[Abel Abraham Camarillo Ojeda]

hi ports

Mojo::JSON::MaybeXS is a monkey-patch module for using JSON::MaybeXS as
the JSON encoder for a Mojolicious application, or anything else using
Mojo::JSON. It must be loaded before Mojo::JSON so the new functions
will be properly exported.

this requires my previous patch (sent to ports@) about perl.port.mk

comments?

tests ok on amd64

thanks.


p5-Mojo-JSON-MaybeXS.tgz
Description: GNU Zip compressed data

patch: perl.port.mk to support Module::Build::Tiny

[Abel Abraham Camarillo Ojeda]

Module::Build::Tiny according to its docs:

   Incompatibilities
   •   Argument parsing

   Module::Build has an extremely permissive way of argument handling,
   Module::Build::Tiny only supports a (sane) subset of that. In
   particular, "./Build destdir=/foo" does not work, you will need to
   pass it as "./Build --destdir=/foo".

also, after a discussion on #toolchain on irc.perl.org it seems that
Module::Build::Tiny requires options to be after actions.

this patch enables instalation of packages that use Module::Build::Tiny
and don't have Module::Build compatibility - like my following port
of Mojo::JSON::MaybeXS.

patch attached - gmail.

comments, ideas?

thanks.
Index: perl.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/perl.port.mk,v
retrieving revision 1.24
diff -u -p -r1.24 perl.port.mk
--- perl.port.mk10 Aug 2014 08:59:48 -  1.24
+++ perl.port.mk8 Mar 2016 04:34:26 -
@@ -25,12 +25,12 @@ MODPERL_configure = \
arch=`perl -e 'use Config; print $$Config{archname}, "\n";'`; \
 cd ${WRKSRC}; ${_SYSTRACE_CMD} ${SETENV} ${CONFIGURE_ENV} \
perl Build.PL \
-   install_path=lib="${PREFIX}/libdata/perl5/site_perl" \
-   install_path=arch="${PREFIX}/libdata/perl5/site_perl/$$arch" \
-   install_path=libdoc="${PREFIX}/man/man3p" \
-   install_path=bindoc="${PREFIX}/man/man1" \
-   install_path=bin="${PREFIX}/bin" \
-   install_path=script="${PREFIX}/bin" ${CONFIGURE_ARGS} 
+   --install_path=lib="${PREFIX}/libdata/perl5/site_perl" \
+   --install_path=arch="${PREFIX}/libdata/perl5/site_perl/$$arch" \
+   --install_path=libdoc="${PREFIX}/man/man3p" \
+   --install_path=bindoc="${PREFIX}/man/man1" \
+   --install_path=bin="${PREFIX}/bin" \
+   --install_path=script="${PREFIX}/bin" ${CONFIGURE_ARGS}
 .else
 MODPERL_configure = ${_MODPERL_preconfig}; \
arch=`perl -e 'use Config; print $$Config{archname}, "\n";'`; \
@@ -73,7 +73,7 @@ MODPERL_TEST_TARGET = \
${MODPERL_BUILD} ${TEST_TARGET}
 MODPERL_INSTALL_TARGET = \
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} perl \
-   ${MODPERL_BUILD} destdir=${WRKINST} ${FAKE_TARGET}
+   ${MODPERL_BUILD} ${FAKE_TARGET} --destdir=${WRKINST}
 
 .  if !target(do-build)
 do-build: 

Re: [update] net/transmission

[Josh Grosse]

On Mon, Mar 07, 2016 at 09:33:58PM +, Christian Weisgerber wrote:
> I think you misunderstand GCC4_ARCHS.  GCC4_ARCHS are the architectures
> that have gcc 4.2.1 in base.  It has nothing to do with the gcc4
> module, which covers gcc 4.9.  And there is no reason not to build
> -main and -gtk on architectures that lack gcc 4.9.

You are correct.  A quick tour of bsd.own.mk has enlightened me.

> I think you want something like this:
> 
> ONLY_FOR_ARCHS-qt=${MODGCC4_ARCHS}
> 
> MODULES=  ... gcc4
> MODGCC4_ARCHS=[list of archs where gcc 4.9 is available]
> 
> .if ${BUILD_PACKAGES:M-qt}
> MODULES+= x11/qt5
> ...
> .endif

Thank you, naddy, for your kind patience with my port update.  This one in
particular has been a learning experience, and I appreciate the guidance.
I've applied your recommendation, using ONLY_FOR_ARCHS from lang/gcc/4.9, as 
can be seen in this incremental diff:

> diff --git a/net/transmission/Makefile b/net/transmission/Makefile
> index 7f27b5b..7e0e213 100644
> --- a/net/transmission/Makefile
> +++ b/net/transmission/Makefile
> @@ -21,7 +21,8 @@ EXTRACT_SUFX=   .tar.xz
>  
>  MULTI_PACKAGES=  -main -gtk -qt
>  
> -ONLY_FOR_ARCHS=  ${GCC4_ARCHS}
> +ONLY_FOR_ARCHS-qt=   ${MODGCC4_ARCHS}
> +MODGCC4_ARCHS=   amd64 arm hppa i386 mips64 mips64el powerpc sparc 
> sparc64
>  
>  PSEUDO_FLAVORS=  no_gtk no_qt
>  FLAVOR?=

The full diff against the ports tree follows.

Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.101
diff -u -p -r1.101 Makefile
--- Makefile30 Oct 2015 12:47:40 -  1.101
+++ Makefile8 Mar 2016 01:09:50 -
@@ -4,14 +4,14 @@ COMMENT-main= BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.84
+VER=   2.92
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
 PKGNAME-qt=transmission-qt-${VER}
-REVISION=  5
 CATEGORIES=net
 HOMEPAGE=  http://www.transmissionbt.com/
+MAINTAINER=Josh Grosse 
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=  Yes
@@ -21,7 +21,8 @@ EXTRACT_SUFX= .tar.xz
 
 MULTI_PACKAGES=-main -gtk -qt
 
-ONLY_FOR_ARCHS-qt=${GCC4_ARCHS}
+ONLY_FOR_ARCHS-qt= ${MODGCC4_ARCHS}
+MODGCC4_ARCHS= amd64 arm hppa i386 mips64 mips64el powerpc sparc sparc64
 
 PSEUDO_FLAVORS=no_gtk no_qt
 FLAVOR?=
@@ -41,14 +42,10 @@ WANTLIB-gtk=${WANTLIB-common} ICE SM X1
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm epoxy idn nghttp2
 WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtXml \
-   ICE SM X11 Xext Xi Xinerama Xrender \
-   fontconfig freetype stdc++
+   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
+   fontconfig freetype estdc++
 
 MODULES=   devel/gettext textproc/intltool
-.if ${BUILD_PACKAGES:M-qt}
-MODULES+=  x11/qt4
-.endif
 
 LIB_DEPENDS-common=${MODGETTEXT_LIB_DEPENDS} \
devel/libevent2 \
@@ -69,7 +66,9 @@ RUN_DEPENDS-qt=   ${PKGNAME-main}:${BUILD_
 
 USE_GMAKE= Yes
 CONFIGURE_STYLE=gnu
+
 CONFIGURE_ARGS=--disable-shared \
+   --enable-cli \
--enable-external-natpmp
 
 # -I$(top_builddir)/third-party is required, but configure fails to
@@ -78,8 +77,15 @@ CONFIGURE_ARGS=  --disable-shared \
 CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/third-party -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
 
-QMAKE_ARGS=QMAKE_CXX="${CXX}" \
-   QMAKE_CXXFLAGS="${CXXFLAGS}"
+.if ${BUILD_PACKAGES:M-qt}
+MODULES+=  x11/qt5
+MODQMAKE_PROJECTS= qt/qtr.pro
+CONFIGURE_STYLE+=  qmake
+SEPARATE_BUILD=No
+MODQMAKE_INSTALL_ROOT= ${PREFIX}
+.else
+MODULES+=  gcc4
+.endif
 
 .if !${BUILD_PACKAGES:M-gtk}
 CONFIGURE_ARGS+=--without-gtk
@@ -90,12 +96,10 @@ pre-patch:
 
 .if ${BUILD_PACKAGES:M-qt}
 post-build:
-   cd ${WRKSRC}/qt; qmake4 ${QMAKE_ARGS} qtr.pro; make ${MAKE_FLAGS}
+   ${MODQMAKE_build}
 
 post-install:
-   cd ${WRKSRC}/qt; make ${MAKE_FLAGS} install INSTALL_ROOT=${PREFIX} \
-   INSTALL_FILE="${INSTALL_DATA}" \
-   INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+   ${MODQMAKE_install}
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/qt/transmission-qt.desktop \
${PREFIX}/share/applications/
Index: distinfo
===
RCS file: /systems/cvs/ports/net/transmission/distinfo,v
retrieving revision 1.49
diff -u -p -r1.49 distinfo
--- distinfo21 Jul 2014 14:59:17 -  1.49
+++ distinfo7 Mar 2016 11:01:47 -
@@ -1,2 +1,2 @@
-SHA256 

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/03/07 17:27:03

Modified files:
graphics/ImageMagick: Makefile distinfo 
graphics/ImageMagick/patches: patch-configure_ac 
  patch-magick_ImageMagick_pc_in 
  patch-magick_MagickCore_pc_in 
  patch-wand_MagickWand_pc_in 
  patch-wand_Wand_pc_in 
graphics/ImageMagick/pkg: PLIST 

Log message:
update to ImageMagick-6.9.3-7

CVS: cvs.openbsd.org: ports

[Adam Wolk]

CVSROOT:/cvs
Module name:ports
Changes by: aw...@cvs.openbsd.org   2016/03/07 16:05:07

Modified files:
www/libwebsockets: Makefile distinfo 

Log message:
Bump libwebsockets from 1.7.2 to 1.7.3

OK abieber@

Re: Face it, GCC 4.6 is not 4.9

[Tobias Ulmer]

On Mon, Mar 07, 2016 at 10:58:39PM +0100, Landry Breuil wrote:
> On Mon, Mar 07, 2016 at 10:46:51PM +0100, Christian Weisgerber wrote:
> > http://build-failures.rhaalovely.net/alpha/
> > shows pretty clearly that GCC 4.6 is not equivalent to 4.9.  Ports
> > that use MODULES=gcc4 and that build fine elsewhere with 4.9 are
> > broken on alpha with 4.6 because the compiler is too old.
> > 
> > If somebody wants to go through the list of MODULES=gcc4 ports and
> > individually mark those that build with 4.6, that's great, but as
> > a default it doesn't make sense.
> 
> +1 from me. That somebody could also try finishing the missing bits for
> 4.9 on alpha..
> http://build-failures.rhaalovely.net/alpha/2016-01-08/lang/gcc/4.9%2C-c%2B%2B.log

How is this still on? This isn't just some OpenBSD specific problem,
many productive hours in gdb and the gcc bugzilla suggest there is a
serious problems in instruction combination (combine.c) on alpha. This
leads to all kinds of funky crashes. Maybe upstream finally fixed it in
5.x, they've made multiple attempts already.

> 
> Landry
> 

CVS: cvs.openbsd.org: ports

[Remi Pointel]

CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2016/03/07 15:29:54

Modified files:
security/oletools: Makefile 
security/oletools/pkg: PLIST 

Log message:
install mraptor and ezhexviewer tools.
ok benoit@.

Re: Face it, GCC 4.6 is not 4.9

[Tobias Ulmer]

On Mon, Mar 07, 2016 at 10:46:51PM +0100, Christian Weisgerber wrote:
> http://build-failures.rhaalovely.net/alpha/
> shows pretty clearly that GCC 4.6 is not equivalent to 4.9.  Ports
> that use MODULES=gcc4 and that build fine elsewhere with 4.9 are
> broken on alpha with 4.6 because the compiler is too old.
> 
> If somebody wants to go through the list of MODULES=gcc4 ports and
> individually mark those that build with 4.6, that's great, but as
> a default it doesn't make sense.

Increase the pain.. ok.

Re: Face it, GCC 4.6 is not 4.9

[Landry Breuil]

On Mon, Mar 07, 2016 at 10:46:51PM +0100, Christian Weisgerber wrote:
> http://build-failures.rhaalovely.net/alpha/
> shows pretty clearly that GCC 4.6 is not equivalent to 4.9.  Ports
> that use MODULES=gcc4 and that build fine elsewhere with 4.9 are
> broken on alpha with 4.6 because the compiler is too old.
> 
> If somebody wants to go through the list of MODULES=gcc4 ports and
> individually mark those that build with 4.6, that's great, but as
> a default it doesn't make sense.

+1 from me. That somebody could also try finishing the missing bits for
4.9 on alpha..
http://build-failures.rhaalovely.net/alpha/2016-01-08/lang/gcc/4.9%2C-c%2B%2B.log

Landry

Face it, GCC 4.6 is not 4.9

[Christian Weisgerber]

http://build-failures.rhaalovely.net/alpha/
shows pretty clearly that GCC 4.6 is not equivalent to 4.9.  Ports
that use MODULES=gcc4 and that build fine elsewhere with 4.9 are
broken on alpha with 4.6 because the compiler is too old.

If somebody wants to go through the list of MODULES=gcc4 ports and
individually mark those that build with 4.6, that's great, but as
a default it doesn't make sense.

Index: gcc4.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/gcc4.port.mk,v
retrieving revision 1.11
diff -u -p -r1.11 gcc4.port.mk
--- gcc4.port.mk28 May 2015 08:12:38 -  1.11
+++ gcc4.port.mk7 Mar 2016 21:41:39 -
@@ -1,6 +1,2 @@
-.if ${MACHINE_ARCH} == "alpha"
-MODGCC4_VERSION?=4.6
-.else
 MODGCC4_VERSION?=4.9
-.endif
 .include "${PORTSDIR}/lang/gcc/${MODGCC4_VERSION}/gcc4.port.mk"
-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

Re: [update] net/transmission

[Christian Weisgerber]

On 2016-03-07, Josh Grosse  wrote:

> Attached is a new update, from 2.90 -> 2.92.

Sorry, I still don't think this is right.

> -ONLY_FOR_ARCHS-qt=${GCC4_ARCHS}
> +ONLY_FOR_ARCHS=  ${GCC4_ARCHS}

> +.if ${BUILD_PACKAGES:M-qt}
> +MODULES+=x11/qt5
> +MODQMAKE_PROJECTS=   qt/qtr.pro
> +CONFIGURE_STYLE+=qmake
> +SEPARATE_BUILD=  No
> +MODQMAKE_INSTALL_ROOT=   ${PREFIX}
> +.else
> +MODULES+=gcc4
> +.endif

I think you misunderstand GCC4_ARCHS.  GCC4_ARCHS are the architectures
that have gcc 4.2.1 in base.  It has nothing to do with the gcc4
module, which covers gcc 4.9.  And there is no reason not to build
-main and -gtk on architectures that lack gcc 4.9.

I think you want something like this:

ONLY_FOR_ARCHS-qt=${MODGCC4_ARCHS}

MODULES=... gcc4
MODGCC4_ARCHS=  [list of archs where gcc 4.9 is available]

.if ${BUILD_PACKAGES:M-qt}
MODULES+=   x11/qt5
...
.endif

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

UPDATE: security/luasec-0.6

[Gleydson Soares]

here is an update for luasec 0.6. builds and seems fine.
most of the patches can go away.

full changelog at:
https://github.com/brunoos/luasec/blob/master/CHANGELOG

OK?

Index: Makefile
===
RCS file: /cvs/ports/security/luasec/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile17 Jul 2014 21:06:16 -  1.15
+++ Makefile7 Mar 2016 21:09:53 -
@@ -3,8 +3,7 @@
 SHARED_ONLY=   Yes
 
 COMMENT=   lua binding to OpenSSL to provide TLS/SSL communication
-VERSION=   0.5
-REVISION=  1
+VERSION=   0.6
 DISTNAME=  luasec-${VERSION}
 CATEGORIES=security
 MASTER_SITES=  https://github.com/brunoos/luasec/archive/
Index: distinfo
===
RCS file: /cvs/ports/security/luasec/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo20 Mar 2014 19:21:00 -  1.5
+++ distinfo7 Mar 2016 21:09:53 -
@@ -1,2 +1,2 @@
-SHA256 (luasec-0.5.tar.gz) = ZIBZj3SSrEeba2CLX7FIgia/pu9nXin2sk2+kJkINSM=
-SIZE (luasec-0.5.tar.gz) = 46738
+SHA256 (luasec-0.6.tar.gz) = zvOjXBi+uKVNnIzmJgpMq72aOG3ocRMg0ITa/60K7V0=
+SIZE (luasec-0.6.tar.gz) = 51071
Index: patches/patch-src_context_c
===
RCS file: patches/patch-src_context_c
diff -N patches/patch-src_context_c
--- patches/patch-src_context_c 13 Nov 2015 02:48:29 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_context_c,v 1.2 2015/11/13 02:48:29 gsoares Exp $
-
-merged upstream
-github.com/brunoos/luasec/commit/49ea6b8ba654f118fbb158da098e6ef288519126
-
 src/context.c.orig Sat Jul 18 11:36:23 2015
-+++ src/context.c  Sat Jul 18 11:42:12 2015
-@@ -66,7 +66,9 @@ static int set_option_flag(const char *opt, unsigned l
- static LSEC_SSL_METHOD* str2method(const char *method)
- {
-   if (!strcmp(method, "sslv23"))  return SSLv23_method();
-+#ifndef OPENSSL_NO_SSL3
-   if (!strcmp(method, "sslv3"))   return SSLv3_method();
-+#endif
-   if (!strcmp(method, "tlsv1"))   return TLSv1_method();
- #if (OPENSSL_VERSION_NUMBER >= 0x1000100fL)
-   if (!strcmp(method, "tlsv1_1")) return TLSv1_1_method();
Index: patches/patch-src_ssl_c
===
RCS file: patches/patch-src_ssl_c
diff -N patches/patch-src_ssl_c
--- patches/patch-src_ssl_c 17 Jul 2014 21:06:16 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_ssl_c,v 1.1 2014/07/17 21:06:16 sthen Exp $
 src/ssl.c.orig Mon Jul 14 22:58:19 2014
-+++ src/ssl.c  Mon Jul 14 23:01:06 2014
-@@ -401,7 +401,11 @@ static int meth_want(lua_State *L)
-  */
- static int meth_compression(lua_State *L)
- {
-+#ifdef OPENSSL_NO_COMP
-+  const void *comp;
-+#else
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
- lua_pushnil(L);
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/luasec/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST   20 Mar 2014 19:21:00 -  1.5
+++ pkg/PLIST   7 Mar 2016 21:09:53 -
@@ -3,16 +3,23 @@ lib/lua/${MODLUA_VERSION}/ssl.so
 share/examples/${FULLPKGNAME}/
 share/examples/${FULLPKGNAME}/README
 share/examples/${FULLPKGNAME}/certs/
+share/examples/${FULLPKGNAME}/certs/all.bat
+share/examples/${FULLPKGNAME}/certs/clientA.bat
 share/examples/${FULLPKGNAME}/certs/clientA.cnf
 share/examples/${FULLPKGNAME}/certs/clientA.sh
+share/examples/${FULLPKGNAME}/certs/clientB.bat
 share/examples/${FULLPKGNAME}/certs/clientB.cnf
 share/examples/${FULLPKGNAME}/certs/clientB.sh
+share/examples/${FULLPKGNAME}/certs/rootA.bat
 share/examples/${FULLPKGNAME}/certs/rootA.cnf
 share/examples/${FULLPKGNAME}/certs/rootA.sh
+share/examples/${FULLPKGNAME}/certs/rootB.bat
 share/examples/${FULLPKGNAME}/certs/rootB.cnf
 share/examples/${FULLPKGNAME}/certs/rootB.sh
+share/examples/${FULLPKGNAME}/certs/serverA.bat
 share/examples/${FULLPKGNAME}/certs/serverA.cnf
 share/examples/${FULLPKGNAME}/certs/serverA.sh
+share/examples/${FULLPKGNAME}/certs/serverB.bat
 share/examples/${FULLPKGNAME}/certs/serverB.cnf
 share/examples/${FULLPKGNAME}/certs/serverB.sh
 share/examples/${FULLPKGNAME}/chain/
@@ -44,6 +51,9 @@ share/examples/${FULLPKGNAME}/loop/serve
 share/examples/${FULLPKGNAME}/oneshot/
 share/examples/${FULLPKGNAME}/oneshot/client.lua
 share/examples/${FULLPKGNAME}/oneshot/server.lua
+share/examples/${FULLPKGNAME}/sni/
+share/examples/${FULLPKGNAME}/sni/client.lua
+share/examples/${FULLPKGNAME}/sni/server.lua
 share/examples/${FULLPKGNAME}/verification/
 share/examples/${FULLPKGNAME}/verification/fail-string/
 share/examples/${FULLPKGNAME}/verification/fail-string/client.lua

CVS: cvs.openbsd.org: ports

[Remi Pointel]

CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2016/03/07 14:07:23

Modified files:
security   : Makefile 

Log message:
+ SUBDIR += oledump

CVS: cvs.openbsd.org: ports

[Remi Pointel]

CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2016/03/07 14:06:44

Log message:
import oledump, a program to analyze OLE files (Compound File Binary 
Format).
with inputs and ok benoit@.

Status:

Vendor Tag: rpointel
Release Tags:   rpointel_20160307

N ports/security/oledump/Makefile
N ports/security/oledump/distinfo
N ports/security/oledump/pkg/PLIST
N ports/security/oledump/pkg/DESCR

No conflicts created by this import

[UPDATE] www/libwebsockets 1.7.2 => 1.7.3

[Adam Wolk]

Hi ports@

Straightforward port bump but I'm upping the major as I don't trust
upstream that much on the ABI promise.

Upstream Changelog
-

v1.7.3
==

NB: No API change since v1.7.0

Fixes
-

1) MAJOR connections on ah waiting list that closed did not get removed
from the waiting list...

2) MAJOR since we added the ability to hold an ah across http keepalive
transactions where more headers had already arrived, we broke the
ability to tell if more headers had arrived.  Result was if the browser
didn't close the keepalive, we retained ah for the lifetime of the
keepalive, using up the pool.

3) MAJOR windows-only-POLLHUP was not coming

4) Fix build on NetBSD
---

tested on a -current snapshot from Mar 6th amd64 compiled against a
closed source koparo.com product.

Any feedback, OKs?

Regards,
Adam

Index: Makefile
===
RCS file: /cvs/ports/www/libwebsockets/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile27 Feb 2016 22:31:46 -  1.5
+++ Makefile7 Mar 2016 20:57:25 -
@@ -4,10 +4,10 @@ COMMENT = lightweight C library for fas
 
 GH_ACCOUNT =   warmcat
 GH_PROJECT =   libwebsockets
-V =1.7.2
+V =1.7.3
 GH_TAGNAME =   v$V
 
-SHARED_LIBS =  websockets 2.0 # 7
+SHARED_LIBS =  websockets 3.0 # 7
 
 CATEGORIES =   www
 
Index: distinfo
===
RCS file: /cvs/ports/www/libwebsockets/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo27 Feb 2016 22:31:46 -  1.3
+++ distinfo7 Mar 2016 20:57:25 -
@@ -1,2 +1,2 @@
-SHA256 (libwebsockets-1.7.2.tar.gz) = 
h/nlNl8k99rmWhtpf1jDPzM5S5Gal9MZOZOpZv/V/tU=
-SIZE (libwebsockets-1.7.2.tar.gz) = 2908161
+SHA256 (libwebsockets-1.7.3.tar.gz) = 
xvMnLX4CNKnvkrOGIvNsQWbu3kIl42/k943SreA+nFI=
+SIZE (libwebsockets-1.7.3.tar.gz) = 2908785

CVS: cvs.openbsd.org: ports

[Remi Pointel]

CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2016/03/07 13:44:53

Log message:
import olefile, a Python package to parse, read and write
Microsoft OLE2 files.
ok benoit@.

Status:

Vendor Tag: rpointel
Release Tags:   rpointel_20160307

N ports/devel/py-olefile/Makefile
N ports/devel/py-olefile/distinfo
N ports/devel/py-olefile/pkg/PLIST
N ports/devel/py-olefile/pkg/DESCR

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Remi Pointel]

CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2016/03/07 13:45:41

Modified files:
devel  : Makefile 

Log message:
+ SUBDIR += py-olefile

CVS: cvs.openbsd.org: ports

[Remi Pointel]

CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2016/03/07 11:45:54

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

Log message:
update to 0.43.
ok benoit@.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/03/07 10:49:10

Modified files:
net/librenms   : Makefile 
Added files:
net/librenms/patches: patch-includes_common_php 

Log message:
don't use `git rev-parse HEAD`, it's not going to work on a
non-git-checkout as used in the package anyway (and users may
not have git installed, so there's an ugly error message).

use snmpget -V instead of --version, long getopt doesn't
seem to be working at least with 5.7.3 on OpenBSD.

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2016/03/07 10:34:44

Modified files:
multimedia/synfigstudio: Makefile 

Log message:
BROKEN-sparc64 =   terminate called after throwing an instance of 
'synfig::Exception::IDNotFound'

CVS: cvs.openbsd.org: ports

[Pascal Stumpf]

CVSROOT:/cvs
Module name:ports
Changes by: pas...@cvs.openbsd.org  2016/03/07 10:03:05

Modified files:
devel/llvm : Makefile 
devel/llvm/patches: patch-tools_clang_lib_Driver_Tools_cpp 

Log message:
Correct LLVM linker patch: -L arguments passed on the command line need to be
processed *before* adding default -L directories.  Fixes
mail/mozilla-thunderbird.

ok landry@

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/03/07 09:43:03

Modified files:
net/librenms   : Makefile distinfo 
net/librenms/patches: patch-daily_sh 
  patch-includes_defaults_inc_php 
  patch-includes_definitions_inc_php 
  patch-includes_functions_php 
  patch-poller-wrapper_py 
net/librenms/pkg: PLIST 

Log message:
update to librenms-201603

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/03/07 08:34:16

Modified files:
mail/exim  : Makefile 
Added files:
mail/exim/patches: patch-src_tls-openssl_c 

Log message:
fix ECDH as server in Exim, from Renaud Allard

Re: apache-httpd-openbsd pexp conflicts with httpd's one

[Stuart Henderson]

On 2016/03/07 10:18, Jiri B wrote:
> > Or we could say that it's time to remove apache-httpd-openbsd?
> 
> OK, but what's approach for apache2 and chroot? No approach or
> on a TODO list?

https://httpd.apache.org/docs/2.4/mod/mod_unixd.html, isn't it?

Re: exim port with libressl

[Stuart Henderson]

On 2016/03/07 14:03, Renaud Allard wrote:
> Hello,
> 
> There is a "bug" in exim. When compiled with LibreSSL, it doesn't allow
> elliptic curves suites to be used as a server. They do work when exim is
> acting as a client.
> I made a patch, but if ports are not yet frozen for 5.9, it might be a good
> idea to integrate it into the port before ports are frozen.
> The reference bug is https://bugs.exim.org/show_bug.cgi?id=1806
> 
> Best Regards
> 
> 



Committed. Too late for 5.9, we are post-unlock now.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 08:25:31

Modified files:
net/retroshare : Makefile 
Added files:
net/retroshare/patches: 
patch-src_libbitdht_src_bitdht_bdquery_cc 

Log message:
Fix time_t issues, patch alredy sent upstream.

okay stsp@

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 08:22:58

Modified files:
x11/qwt: Makefile 

Log message:
Switch to MODQMAKE, -3 Makefile lines.

Re: apache-httpd-openbsd pexp conflicts with httpd's one

[Jiri B]

> Or we could say that it's time to remove apache-httpd-openbsd?

OK, but what's approach for apache2 and chroot? No approach or
on a TODO list?

Or is chrooting considered obsolete?

j.

Re: apache-httpd-openbsd pexp conflicts with httpd's one

[Landry Breuil]

On Mon, Mar 07, 2016 at 02:40:30PM +, Stuart Henderson wrote:
> On 2016/03/07 09:28, Jiri B wrote:
> > Well, maybe we should modify apache-httpd-openbsd process name to
> > httpd1 to mimic what we do for apache2?
> 
> apache-httpd-openbsd is on the list for removal, we just have some
> www/mod_* to remove and tentacles in php, plus these to update or
> remove:
> 
> www/clearsilver

Last release in 2007

> www/p5-Apache-Test

Can depend on the regular apache2, conditional RDEP

> www/p5-CGI-SpeedyCGI

Last release in 2002

> www/p5-HTML-Embperl

Homepage moved to http://perl.apache.org/embperl/, not really alive.

> www/p5-libapreq

Can be updated to work with apache2 ? not really alive either:
http://httpd.apache.org/apreq/

Landry

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 07:54:17

Modified files:
www/minitube   : Makefile 

Log message:
Convert to MODQMAKE, -6 Makefile lines.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 07:51:53

Modified files:
textproc/xxdiff: Makefile 

Log message:
Convert to MODQMAKE and drop USE_GMAKE dependency, -2 Makefile lines.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 07:48:32

Modified files:
www/arora  : Makefile 

Log message:
Convert to MODQMAKE. No Makefile lines count change, but that's a style issue.

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2016/03/07 07:44:46

Modified files:
geo/josm   : Makefile distinfo 

Log message:
Update to josm r9900, from MAINTAINER Holger Mikolon.

exim port with libressl

[Renaud Allard]

Hello,

There is a "bug" in exim. When compiled with LibreSSL, it doesn't allow 
elliptic curves suites to be used as a server. They do work when exim is 
acting as a client.
I made a patch, but if ports are not yet frozen for 5.9, it might be a 
good idea to integrate it into the port before ports are frozen.

The reference bug is https://bugs.exim.org/show_bug.cgi?id=1806

Best Regards




smime.p7s
Description: S/MIME Cryptographic Signature

Re: apache-httpd-openbsd pexp conflicts with httpd's one

[Stuart Henderson]

On 2016/03/07 09:28, Jiri B wrote:
> Well, maybe we should modify apache-httpd-openbsd process name to
> httpd1 to mimic what we do for apache2?

apache-httpd-openbsd is on the list for removal, we just have some
www/mod_* to remove and tentacles in php, plus these to update or
remove:

www/clearsilver
www/p5-Apache-Test
www/p5-CGI-SpeedyCGI
www/p5-HTML-Embperl
www/p5-libapreq

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 07:39:27

Modified files:
security/yubico/yubikey-personalization-gui: Makefile 

Log message:
Convert to MODQMAKE, -3 Makefile lines.

update: switch lang/rust to use devel/llvm

[Sebastien Marie]

Hi,

Now we have an updated LLVM version in ports, we could use it for
building lang/rust instead of build the embedded version. It should
accelerate a bit the build time...

Please note that devel/llvm is a BUILD_DEPENDS only as rustc is statically
linked with several LLVM libraries.

I have disabled a part of testsuite, as their require FileCheck binary
(from LLVM) to be present, and we don't install it.

Comments ? OK ?
-- 
Sebastien Marie

Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile5 Mar 2016 15:05:33 -   1.16
+++ Makefile7 Mar 2016 14:34:37 -
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2016/03/05 15:05:33 semarie Exp $
+# $OpenBSD: Makefile,v 1.15 2016/01/25 05:36:05 semarie Exp $
 
 # snapshots are only available for amd64, for now
 ONLY_FOR_ARCHS =   amd64
@@ -10,6 +10,7 @@ COMMENT-doc = html documentation for ru
 V =1.7.0
 RUST_HASH =6a154fe0
 DISTNAME = rustc-${V}-src
+REVISION = 0
 
 SUBST_VARS +=  RUST_HASH
 
@@ -32,7 +33,7 @@ MAINTAINER =  Sebastien Marie  ProcRes {
+-let irfile = output_base_name(config, testfile).with_extension("ll");
+-let prog = config.llvm_bin_path.as_ref().unwrap().join("FileCheck");
+-let proc_args = ProcArgs {
+-// FIXME (#9639): This needs to handle non-utf8 paths
+-prog: prog.to_str().unwrap().to_owned(),
+-args: vec!(format!("-input-file={}", irfile.to_str().unwrap()),
+-   testfile.to_str().unwrap().to_owned())
+-};
+-compose_and_run(config, testfile, proc_args, Vec::new(), "", None, None)
+-}
+-
+ fn run_codegen_test(config: , props: , testfile: ) {
+ 
+ if 

Re: apache-httpd-openbsd pexp conflicts with httpd's one

[Antoine Jacoutot]

On Mon, Mar 07, 2016 at 09:28:09AM -0500, Jiri B wrote:
> Hi,
> 
> apache-httpd-openbsd pexp conflicts with base httpd pexp.
> 
> * apache-httpd-openbsd
>   pexp="httpd: parent.*"
> 
> # ps aux | grep httpd 
> www  30230  0.0  1.2 72272 24376 ??  SsSat10PM0:03.16 httpd: 
> parent [chroot /var/www] (httpd)
> www  13731  0.0  2.3 73008 47032 ??  I Sat10PM0:06.62 httpd: 
> child (httpd)
> www  10501  0.0  2.3 73076 48188 ??  I Sat10PM0:16.88 httpd: 
> child (httpd)
> www   9071  0.0  2.0 73000 41832 ??  I Sat10PM0:08.97 httpd: 
> child (httpd)
> www  17830  0.0  2.0 73088 42236 ??  I Sat10PM0:08.50 httpd: 
> child (httpd)
> www  29437  0.0  1.9 73004 40296 ??  I Sat10PM0:08.11 httpd: 
> child (httpd)
> www   4192  0.0  2.4 73080 49128 ??  I Sat10PM0:08.52 httpd: 
> child (httpd)
> www  29101  0.0  1.9 73016 39592 ??  I Sat10PM0:04.94 httpd: 
> child (httpd)
> www  23205  0.0  2.0 73016 41852 ??  I Sat10PM0:06.61 httpd: 
> child (httpd)
> www  17791  0.0  1.6 72876 32588 ??  I Sun01AM0:00.54 httpd: 
> child (httpd)
> root 25587  0.0  0.0   168   304 p2  R+ 3:23PM0:00.00 grep httpd
> 
> * (base) httpd
>   pexp="httpd: parent.*"
> 
> # ps aux | grep httpd   
> root 10695  0.2  0.1  1200  2220 ??  Ssp3:23PM0:00.05 httpd: 
> parent (httpd)
> www  13344  0.0  0.1   816  1704 ??  Sp 3:23PM0:00.02 httpd: 
> server (httpd)
> www  15789  0.0  0.1   804  1684 ??  Sp 3:23PM0:00.03 httpd: 
> server (httpd)
> www   2091  0.1  0.1   944  1840 ??  Sp 3:23PM0:00.02 httpd: 
> logger (httpd)
> www  25297  0.1  0.1   812  1808 ??  Sp 3:23PM0:00.02 httpd: 
> server (httpd)
> root 11960  0.0  0.0   164   308 p2  R+ 3:23PM0:00.00 grep httpd
> 
> Well, maybe we should modify apache-httpd-openbsd process name to
> httpd1 to mimic what we do for apache2?

Or we could say that it's time to remove apache-httpd-openbsd?

-- 
Antoine

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 07:32:24

Modified files:
security/qoauth: Makefile 

Log message:
Convert to MODQMAKE, -1 Makefile line.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 07:29:02

Modified files:
security/qca-gnupg: Makefile 
security/qca-gnupg/files: conf.pri 

Log message:
Convert to MODQMAKE, -1 Makefile line.

apache-httpd-openbsd pexp conflicts with httpd's one

[Jiri B]

Hi,

apache-httpd-openbsd pexp conflicts with base httpd pexp.

* apache-httpd-openbsd
  pexp="httpd: parent.*"

# ps aux | grep httpd 
www  30230  0.0  1.2 72272 24376 ??  SsSat10PM0:03.16 httpd: parent 
[chroot /var/www] (httpd)
www  13731  0.0  2.3 73008 47032 ??  I Sat10PM0:06.62 httpd: child 
(httpd)
www  10501  0.0  2.3 73076 48188 ??  I Sat10PM0:16.88 httpd: child 
(httpd)
www   9071  0.0  2.0 73000 41832 ??  I Sat10PM0:08.97 httpd: child 
(httpd)
www  17830  0.0  2.0 73088 42236 ??  I Sat10PM0:08.50 httpd: child 
(httpd)
www  29437  0.0  1.9 73004 40296 ??  I Sat10PM0:08.11 httpd: child 
(httpd)
www   4192  0.0  2.4 73080 49128 ??  I Sat10PM0:08.52 httpd: child 
(httpd)
www  29101  0.0  1.9 73016 39592 ??  I Sat10PM0:04.94 httpd: child 
(httpd)
www  23205  0.0  2.0 73016 41852 ??  I Sat10PM0:06.61 httpd: child 
(httpd)
www  17791  0.0  1.6 72876 32588 ??  I Sun01AM0:00.54 httpd: child 
(httpd)
root 25587  0.0  0.0   168   304 p2  R+ 3:23PM0:00.00 grep httpd

* (base) httpd
  pexp="httpd: parent.*"

# ps aux | grep httpd   
root 10695  0.2  0.1  1200  2220 ??  Ssp3:23PM0:00.05 httpd: parent 
(httpd)
www  13344  0.0  0.1   816  1704 ??  Sp 3:23PM0:00.02 httpd: server 
(httpd)
www  15789  0.0  0.1   804  1684 ??  Sp 3:23PM0:00.03 httpd: server 
(httpd)
www   2091  0.1  0.1   944  1840 ??  Sp 3:23PM0:00.02 httpd: logger 
(httpd)
www  25297  0.1  0.1   812  1808 ??  Sp 3:23PM0:00.02 httpd: server 
(httpd)
root 11960  0.0  0.0   164   308 p2  R+ 3:23PM0:00.00 grep httpd

Well, maybe we should modify apache-httpd-openbsd process name to
httpd1 to mimic what we do for apache2?

j.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 07:23:00

Modified files:
security/qca-ossl: Makefile 
security/qca-ossl/files: conf.pri 

Log message:
Convert to MODQMAKE, -1 Makefile line.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 07:20:44

Modified files:
security/kqoauth: Makefile 

Log message:
Convert to MODQMAKE, -3 Makefile lines.

CVS: cvs.openbsd.org: ports

[Matthieu Herrb]

CVSROOT:/cvs
Module name:ports
Changes by: matth...@cvs.openbsd.org2016/03/07 07:19:50

Modified files:
mail/sendmail  : Makefile 
mail/sendmail/files/cf: openbsd-submit.mc 
Added files:
mail/sendmail/patches: patch-cf_feature_msp_m4 

Log message:
Replace reference to the old smmsp user to the new _smmsp in the
main shared configuration, so that all generated configuration use it.
ok and help sthen@, jca@

CVS: cvs.openbsd.org: ports

[Matthieu Herrb]

CVSROOT:/cvs
Module name:ports
Changes by: matth...@cvs.openbsd.org2016/03/07 07:17:44

Modified files:
mail/sendmail  : Tag: OPENBSD_5_9 Makefile 
mail/sendmail/files/cf: Tag: OPENBSD_5_9 openbsd-submit.mc 
Removed files:
mail/sendmail/patches: Tag: OPENBSD_5_9 patch-cf_feature_msp_m4 

Log message:
revert previous. Not intended for -stable. Sorry for the mess.

[PATCH] geo/josm 9900

[Holger Mikolon]

Hi,

below is yet another straight forward update for geo/josm.
Thanks for committing!

Holger
;-se


Index: Makefile
===
RCS file: /cvs/ports/geo/josm/Makefile,v
retrieving revision 1.32
diff -u -p -u -r1.32 Makefile
--- Makefile11 Jan 2016 22:18:33 -  1.32
+++ Makefile7 Mar 2016 13:51:01 -
@@ -2,7 +2,7 @@
 
 COMMENT=   OpenStreetMap map editor
 
-SVN_REV=   9329
+SVN_REV=   9900
 DISTNAME=  josm-snapshot-${SVN_REV}
 EXTRACT_SUFX = .jar
 EXTRACT_CASES+=*.jar) unzip -qa ${FULLDISTDIR}/$$archive -d 
${WRKDIST};;
Index: distinfo
===
RCS file: /cvs/ports/geo/josm/distinfo,v
retrieving revision 1.16
diff -u -p -u -r1.16 distinfo
--- distinfo11 Jan 2016 22:18:33 -  1.16
+++ distinfo7 Mar 2016 13:51:01 -
@@ -1,2 +1,2 @@
-SHA256 (josm-snapshot-9329.jar) = +B6eGRR0uShuRF4O3MdMeJ1yTId5HSvsUgn8+uMdiiA=
-SIZE (josm-snapshot-9329.jar) = 10569664
+SHA256 (josm-snapshot-9900.jar) = vh3qzUTygQ1mkO+PKUQvAq5lviTvwApnHz/qJWBVTrc=
+SIZE (josm-snapshot-9900.jar) = 10769708

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 06:58:28

Modified files:
productivity/fet: Makefile 

Log message:
Convert to MODQMAKE, -1 Makefile line.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 06:50:21

Modified files:
x11/qrfcview   : Makefile 
Added files:
x11/qrfcview/patches: patch-src_mainwindow_cpp 

Log message:
Allow to enter numbers larger than 5000.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 06:54:36

Modified files:
net/retroshare : Makefile 

Log message:
Convert to MODQMAKE, +1 Makefile line (due to adding a comment).

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 06:30:31

Modified files:
games/pokerth  : Makefile 

Log message:
Convert to MODQMAKE, -9 Makefile lines.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 06:25:18

Modified files:
devel/intellij : Makefile distinfo 
devel/intellij/pkg: PLIST 

Log message:
Minor update to 15.0.4.

>From Caspar Schutijser, thanks!

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 06:16:49

Modified files:
productivity/entomologist: Makefile 

Log message:
Convert to MODQMAKE, -1 Makefile line.

Re: [mail/sendmail] Re: CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

Matthieu Herrb  writes:

> On Mon, Mar 07, 2016 at 04:27:04AM -0700, Matthieu Herrb wrote:
>> CVSROOT: /cvs
>> Module name: ports
>> Changes by:  matth...@cvs.openbsd.org2016/03/07 04:27:04
>> 
>> Modified files:
>>  mail/sendmail  : Tag: OPENBSD_5_9 Makefile 
>>  mail/sendmail/files/cf: Tag: OPENBSD_5_9 openbsd-submit.mc 
>> Added files:
>>  mail/sendmail/patches: Tag: OPENBSD_5_9 patch-cf_feature_msp_m4 
>> 
>> Log message:
>> Replace reference to the old smmsp user to the new _smmsp in the
>> main shared configuration, so that all generated configuration use it.
>> ok and help sthen@, jca@
>
> hmm I didn't intend to commit this to -stable. My mistake. 
> Should I back it out ?

I think it should be backed out.  While I'm nearly sure that it won't
break anything, let's not make exceptions for no good reason.

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

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 06:01:28

Modified files:
net/qsynergy   : Makefile 

Log message:
Convert to MODQMAKE, no Makefile lines count change.

[mail/sendmail] SMTP session reuse bugfix

[Claus Assmann]

FYI (I haven't seen this in ports yet):

If sendmail tried to reuse an SMTP session which had already been
closed by the server, then the connection cache could have invalid
information about the session.  One possible consequence was that
STARTTLS was not used even if offered.
The problem can be fixed by either:
- applying the patch (for 8.15.2) available at
  ftp://ftp.sendmail.org/pub/sendmail/8.15.2.mci.p0
  ftp://ftp.sendmail.org/pub/sendmail/8.15.2.mci.p0.sig
- or disabling the connection cache:
define(`confMCI_CACHE_SIZE', `0')

The problem can be mitigated by setting at least one of these options:
- using a very short timeout:
define(`confMCI_CACHE_TIMEOUT', `5s')
- sorting the queue by hosts:
define(`confQUEUE_SORT_ORDER', `Host')

Note: This issue is fixed in sendmail snapshot 8.16.0.16 (or newer)
for those who would like to test upcoming releases.

[mail/sendmail] Re: CVS: cvs.openbsd.org: ports

[Matthieu Herrb]

On Mon, Mar 07, 2016 at 04:27:04AM -0700, Matthieu Herrb wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   matth...@cvs.openbsd.org2016/03/07 04:27:04
> 
> Modified files:
>   mail/sendmail  : Tag: OPENBSD_5_9 Makefile 
>   mail/sendmail/files/cf: Tag: OPENBSD_5_9 openbsd-submit.mc 
> Added files:
>   mail/sendmail/patches: Tag: OPENBSD_5_9 patch-cf_feature_msp_m4 
> 
> Log message:
> Replace reference to the old smmsp user to the new _smmsp in the
> main shared configuration, so that all generated configuration use it.
> ok and help sthen@, jca@

hmm I didn't intend to commit this to -stable. My mistake. 
Should I back it out ?
-- 
Matthieu Herrb


pgptur0tFaYcz.pgp
Description: PGP signature

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 05:51:49

Modified files:
games/jag  : Makefile 

Log message:
Convert to MODQMAKE, -3 Makefile lines.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 05:41:34

Modified files:
editors/texmaker: Makefile 

Log message:
Convert to MODQMAKE, -7 Makefile lines.

Re: [update] net/transmission

[Vadim Zhukov]

2016-03-07 13:59 GMT+03:00 Stuart Henderson :
> On 2016/03/07 13:45, Vadim Zhukov wrote:
>> 2016-03-07 3:23 GMT+03:00 Josh Grosse :
>> > On Sun, Mar 06, 2016 at 12:03:27AM +, Christian Weisgerber wrote:
>> >> ... However, as the
>> >> port stands now, FLAVOR="" builds those subpackages with GCC 4.9
>> >> from ports, but FLAVOR="no_qt" builds them with the base compiler.
>> >> So depending on no_qt the _other_ packages are different.  That is
>> >> wrong.
>> >
>> > Two additional revisions after ensuring the gcc4 module is always
>> > used:
>> >
>> > 1.  As gcc4 is always used, ONLY_FOR_ARCHS= ${GCC4_ARCHS}
>> >
>> > 2.  Deploy the new CONFIGURE_STYLE=gmake.  I have integrated a diff
>> > from Vadim Zhukov below.
>>
>> This is okay zhuk@.
>>
>> --
>>   WBR,
>>   Vadim Zhukov
>>
>
> The distfile for 2.90 has been removed upstream (also given recent
> events it would probably be wise to read through a source diff from
> the previous version in tree ;)

Yep, I had distfile cached. :(

2.92 update is fine with me.

--
  WBR,
  Vadim Zhukov

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 05:37:29

Modified files:
editors/tiled  : Makefile 

Log message:
Convert to MODQMAKE, -10 Makefile lines.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 05:28:33

Modified files:
editors/teaqt  : Makefile 

Log message:
Convert to MODQMAKE, -1 Makefile line.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 05:26:39

Modified files:
editors/focuswriter: Makefile 

Log message:
Convert to MODQMAKE, -6 Makefile lines.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 05:27:49

Modified files:
editors/qscintilla: Makefile 

Log message:
Convert to MODQMAKE, -4 Makefile lines.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 05:24:17

Modified files:
cad/openscad   : Makefile 

Log message:
Convert to MODQMAKE, -3 Makefile lines.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 05:19:53

Modified files:
devel/qgit : Makefile 

Log message:
Convert to MODQMAKE, -2 Makefile lines.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 05:06:14

Modified files:
devel/beediff  : Makefile 

Log message:
Convert to MODQMAKE, -3 Makefile lines.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 04:58:49

Modified files:
audio/mumble   : Makefile 

Log message:
Convert to MODQMAKE, -6 Makefile lines.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 05:01:19

Modified files:
comms/qtserialport: Makefile 

Log message:
Convert to MODQMAKE, -3 Makefile lines.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 04:57:55

Modified files:
graphics/opencsg: Makefile 

Log message:
Convert to MODQMAKE, +2 Makefile lines due to need to keep SUBST_CMD call.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 04:54:12

Modified files:
cad/fritzing   : Makefile 

Log message:
Move to MODQMAKE, +3 Makefile lines - but we have a bonus of "cp => mv"
converstion here, reducing build time significantly.

Re: [update] net/transmission

[Josh Grosse]

On Mon, Mar 07, 2016 at 10:59:38AM +, Stuart Henderson wrote:
> The distfile for 2.90 has been removed upstream (also given recent
> events it would probably be wise to read through a source diff from
> the previous version in tree ;)

The new distfile matches their published SHA256, and this diff shows
the changes in their repository:

Common subdirectories: 14695/.svn and 14714/.svn
Common subdirectories: 14695/.tx and 14714/.tx
diff -uNP 14695/CMakeLists.txt 14714/CMakeLists.txt
--- 14695/CMakeLists.txtMon Mar  7 06:22:56 2016
+++ 14714/CMakeLists.txtMon Mar  7 06:23:37 2016
@@ -41,8 +41,8 @@
 # "Z" for unsupported trunk builds,
 # "0" for stable, supported releases
 # these should be the only two lines you need to change
-set(TR_USER_AGENT_PREFIX "2.90")
-set(TR_PEER_ID_PREFIX "-TR2900-")
+set(TR_USER_AGENT_PREFIX "2.92")
+set(TR_PEER_ID_PREFIX "-TR2920-")
 
 string(REGEX MATCH "^([0-9]+)\\.([0-9]+).*" TR_VERSION 
"${TR_USER_AGENT_PREFIX}")
 set(TR_VERSION_MAJOR "${CMAKE_MATCH_1}")
diff -uNP 14695/Makefile.am 14714/Makefile.am
--- 14695/Makefile.am   Mon Mar  7 06:22:56 2016
+++ 14714/Makefile.am   Mon Mar  7 06:23:35 2016
@@ -51,8 +51,12 @@
   third-party/b64.cmake \
   third-party/dht.cmake \
   third-party/event2.cmake \
+  third-party/event2-01-win32.patch \
+  third-party/event2-02-win32.patch \
   third-party/natpmp.cmake \
   third-party/utp-01-ticket-5002.patch \
+  third-party/utp-02-win32.patch \
+  third-party/utp-03-msvc14.patch \
   third-party/utp.cmake \
   third-party/utp_config.h \
   utils/CMakeLists.txt
diff -uNP 14695/NEWS 14714/NEWS
--- 14695/NEWS  Mon Mar  7 06:22:56 2016
+++ 14714/NEWS  Mon Mar  7 06:23:35 2016
@@ -1,3 +1,25 @@
+=== Transmission 2.92 (2016/03/06) ===
+[http://trac.transmissionbt.com/query?milestone=2.92=component=severity
 All tickets closed by this release]
+ Mac Client 
+  * Build OSX.KeRanger.A ransomware removal into the app
+
+=== Transmission 2.91 (2016/03/06) ===
+[http://trac.transmissionbt.com/query?milestone=2.91=component=severity
 All tickets closed by this release]
+ All Platforms 
+  * Fix Makefile.am to include Windows patches into source archive
+  * Fix miniupnpc script to handle spaces and other special chars in paths
+ Mac Client 
+  * Prevent crash during group rules removal in some cases
+  * Fix failure to remove seeding completion notifications from notification 
center
+  * Show main window and scroll to torrent on notification click
+  * Fix issue on Yosemite where peers view didn't occupy all the available 
space when web seed view was hidden
+ Qt Client 
+  * Fix existing running instance detection and torrents delegation when using 
DBus
+ Daemon 
+  * Fix building on Windows x86
+  * Add `--blocklist-update` argument description to transmission-remote man 
page
+  * Use `-rad` as short form of `--remove-and-delete` option in 
transmission-remote
+
 === Transmission 2.90 (2016/02/28) ===
 
[http://trac.transmissionbt.com/query?milestone=2.90=component=severity
 All tickets closed by this release]
  All Platforms 
Common subdirectories: 14695/Transmission.xcodeproj and 
14714/Transmission.xcodeproj
Common subdirectories: 14695/cli and 14714/cli
Common subdirectories: 14695/cmake and 14714/cmake
diff -uNP 14695/configure.ac 14714/configure.ac
--- 14695/configure.ac  Mon Mar  7 06:22:55 2016
+++ 14714/configure.ac  Mon Mar  7 06:23:34 2016
@@ -3,8 +3,8 @@
 dnl "Z" for unsupported trunk builds,
 dnl "0" for stable, supported releases
 dnl these should be the only two lines you need to change
-m4_define([user_agent_prefix],[2.90])
-m4_define([peer_id_prefix],[-TR2900-])
+m4_define([user_agent_prefix],[2.92])
+m4_define([peer_id_prefix],[-TR2920-])
 
 
AC_INIT([transmission],[user_agent_prefix],[http://trac.transmissionbt.com/newticket])
 AC_SUBST(USERAGENT_PREFIX,[user_agent_prefix])
Common subdirectories: 14695/daemon and 14714/daemon
Common subdirectories: 14695/extras and 14714/extras
Common subdirectories: 14695/gtk and 14714/gtk
Common subdirectories: 14695/libtransmission and 14714/libtransmission
Common subdirectories: 14695/m4 and 14714/m4
Common subdirectories: 14695/macosx and 14714/macosx
Common subdirectories: 14695/po and 14714/po
Common subdirectories: 14695/qt and 14714/qt
Common subdirectories: 14695/third-party and 14714/third-party
Common subdirectories: 14695/utils and 14714/utils
Common subdirectories: 14695/web and 14714/web

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 04:34:24

Modified files:
audio/musique  : Makefile 

Log message:
Convert to MODQMAKE, -3 Makefile lines.

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/03/07 04:33:59

Modified files:
x11/awesome: Makefile distinfo 
x11/awesome/patches: patch-awesome_c 
Removed files:
x11/awesome/patches: patch-common_luaobject_c patch-event_c 
 patch-lib_awful_ewmh_lua_in patch-luaa_c 
 patch-objects_client_c 
 patch-objects_client_h 

Log message:
Update to awesome-3.5.9

CVS: cvs.openbsd.org: ports

[Matthieu Herrb]

CVSROOT:/cvs
Module name:ports
Changes by: matth...@cvs.openbsd.org2016/03/07 04:27:04

Modified files:
mail/sendmail  : Tag: OPENBSD_5_9 Makefile 
mail/sendmail/files/cf: Tag: OPENBSD_5_9 openbsd-submit.mc 
Added files:
mail/sendmail/patches: Tag: OPENBSD_5_9 patch-cf_feature_msp_m4 

Log message:
Replace reference to the old smmsp user to the new _smmsp in the
main shared configuration, so that all generated configuration use it.
ok and help sthen@, jca@

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 04:21:03

Modified files:
x11/qrfcview   : Makefile 

Log message:
Convert to MODQMAKE, no line count change.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 04:14:02

Modified files:
productivity/vym: Makefile 

Log message:
Convert to MODQMAKE, -2 lines of Makefile.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/03/07 03:58:49

Modified files:
security/openssl: Makefile 

Log message:
now that sslscan uses a special build, disable ssl3/rc5 again in openssl port

Re: [update] net/transmission

[Stuart Henderson]

On 2016/03/07 13:45, Vadim Zhukov wrote:
> 2016-03-07 3:23 GMT+03:00 Josh Grosse :
> > On Sun, Mar 06, 2016 at 12:03:27AM +, Christian Weisgerber wrote:
> >> ... However, as the
> >> port stands now, FLAVOR="" builds those subpackages with GCC 4.9
> >> from ports, but FLAVOR="no_qt" builds them with the base compiler.
> >> So depending on no_qt the _other_ packages are different.  That is
> >> wrong.
> >
> > Two additional revisions after ensuring the gcc4 module is always
> > used:
> >
> > 1.  As gcc4 is always used, ONLY_FOR_ARCHS= ${GCC4_ARCHS}
> >
> > 2.  Deploy the new CONFIGURE_STYLE=gmake.  I have integrated a diff
> > from Vadim Zhukov below.
> 
> This is okay zhuk@.
> 
> --
>   WBR,
>   Vadim Zhukov
> 

The distfile for 2.90 has been removed upstream (also given recent
events it would probably be wise to read through a source diff from
the previous version in tree ;)

Re: UPDATE: devel/intellij 15.0.4

[Vadim Zhukov]

2016-03-07 13:49 GMT+03:00 Jiri B :
> On Sun, Mar 06, 2016 at 10:36:10PM +0100, Caspar Schutijser wrote:
>> Hi ports@,
>>
>> Below is an update of devel/intellij to 15.0.4. I tested it on amd64,
>> works fine for me.
>
> Not sure how you did your tests but intellij is far from being
> fully functional on OpenBSD.
>
> See https://github.com/idea4bsd
>
> * fsnotifier has some issues
> * i could not run virtualenv from idea
> * iiuc breakgen should not work too
> * cannot be built from source by default
>
> There's a lot of checking for OS type in java code, and mostly
> there's Windows, Linux, MacOS and little bit of FreeBSD.

Yes, those issues are known and are being worked on (I wish I have
enough time for all of those...). The port we already have is still
useful, though, I use it from time to time.

--
  WBR,
  Vadim Zhukov

Re: [update] net/transmission

[Josh Grosse]

On Mon, Mar 07, 2016 at 01:45:15PM +0300, Vadim Zhukov wrote:
> 2016-03-07 3:23 GMT+03:00 Josh Grosse :
> > On Sun, Mar 06, 2016 at 12:03:27AM +, Christian Weisgerber wrote:
> >> ... However, as the
> >> port stands now, FLAVOR="" builds those subpackages with GCC 4.9
> >> from ports, but FLAVOR="no_qt" builds them with the base compiler.
> >> So depending on no_qt the _other_ packages are different.  That is
> >> wrong.
> >
> > Two additional revisions after ensuring the gcc4 module is always
> > used:
> >
> > 1.  As gcc4 is always used, ONLY_FOR_ARCHS= ${GCC4_ARCHS}
> >
> > 2.  Deploy the new CONFIGURE_STYLE=gmake.  I have integrated a diff
> > from Vadim Zhukov below.
> 
> This is okay zhuk@.

Thank you, Vadim.  Attached is a new update, from 2.90 -> 2.92.  It
fixes minor bugs and includes new security protections for upstream's
OSX binary -- a ransomware attack made the news yesterday and was promptly
addressed.  

Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.101
diff -u -p -r1.101 Makefile
--- Makefile30 Oct 2015 12:47:40 -  1.101
+++ Makefile7 Mar 2016 10:43:24 -
@@ -4,14 +4,14 @@ COMMENT-main= BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.84
+VER=   2.92
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
 PKGNAME-qt=transmission-qt-${VER}
-REVISION=  5
 CATEGORIES=net
 HOMEPAGE=  http://www.transmissionbt.com/
+MAINTAINER=Josh Grosse 
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=  Yes
@@ -21,7 +21,7 @@ EXTRACT_SUFX= .tar.xz
 
 MULTI_PACKAGES=-main -gtk -qt
 
-ONLY_FOR_ARCHS-qt=${GCC4_ARCHS}
+ONLY_FOR_ARCHS=${GCC4_ARCHS}
 
 PSEUDO_FLAVORS=no_gtk no_qt
 FLAVOR?=
@@ -41,14 +41,10 @@ WANTLIB-gtk=${WANTLIB-common} ICE SM X1
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm epoxy idn nghttp2
 WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtXml \
-   ICE SM X11 Xext Xi Xinerama Xrender \
-   fontconfig freetype stdc++
+   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
+   fontconfig freetype estdc++
 
 MODULES=   devel/gettext textproc/intltool
-.if ${BUILD_PACKAGES:M-qt}
-MODULES+=  x11/qt4
-.endif
 
 LIB_DEPENDS-common=${MODGETTEXT_LIB_DEPENDS} \
devel/libevent2 \
@@ -69,7 +65,9 @@ RUN_DEPENDS-qt=   ${PKGNAME-main}:${BUILD_
 
 USE_GMAKE= Yes
 CONFIGURE_STYLE=gnu
+
 CONFIGURE_ARGS=--disable-shared \
+   --enable-cli \
--enable-external-natpmp
 
 # -I$(top_builddir)/third-party is required, but configure fails to
@@ -78,8 +76,15 @@ CONFIGURE_ARGS=  --disable-shared \
 CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/third-party -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
 
-QMAKE_ARGS=QMAKE_CXX="${CXX}" \
-   QMAKE_CXXFLAGS="${CXXFLAGS}"
+.if ${BUILD_PACKAGES:M-qt}
+MODULES+=  x11/qt5
+MODQMAKE_PROJECTS= qt/qtr.pro
+CONFIGURE_STYLE+=  qmake
+SEPARATE_BUILD=No
+MODQMAKE_INSTALL_ROOT= ${PREFIX}
+.else
+MODULES+=  gcc4
+.endif
 
 .if !${BUILD_PACKAGES:M-gtk}
 CONFIGURE_ARGS+=--without-gtk
@@ -90,12 +95,10 @@ pre-patch:
 
 .if ${BUILD_PACKAGES:M-qt}
 post-build:
-   cd ${WRKSRC}/qt; qmake4 ${QMAKE_ARGS} qtr.pro; make ${MAKE_FLAGS}
+   ${MODQMAKE_build}
 
 post-install:
-   cd ${WRKSRC}/qt; make ${MAKE_FLAGS} install INSTALL_ROOT=${PREFIX} \
-   INSTALL_FILE="${INSTALL_DATA}" \
-   INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+   ${MODQMAKE_install}
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/qt/transmission-qt.desktop \
${PREFIX}/share/applications/
Index: distinfo
===
RCS file: /systems/cvs/ports/net/transmission/distinfo,v
retrieving revision 1.49
diff -u -p -r1.49 distinfo
--- distinfo21 Jul 2014 14:59:17 -  1.49
+++ distinfo7 Mar 2016 10:44:04 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.84.tar.xz) = 
qfwZNrTuQUrMcyraBOhDOdZ1XNDQl7y9Ebos/FQNues=
-SIZE (transmission-2.84.tar.xz) = 3077836
+SHA256 (transmission-2.92.tar.xz) = 
Oo0EXDBq2ay3v4ESaTm5WUVTo4hILvoOwb+2eyKs018=
+SIZE (transmission-2.92.tar.xz) = 3378116
Index: patches/patch-libtransmission_peer-mgr_c
===
RCS file: patches/patch-libtransmission_peer-mgr_c
diff -N patches/patch-libtransmission_peer-mgr_c
--- patches/patch-libtransmission_peer-mgr_c1 Jun 2014 11:37:06 -   
1.3
+++ 

Re: mail/sendmail: default to _smmsp user in msp.m4

[Matthieu Herrb]

On Sun, Mar 06, 2016 at 10:06:11PM +0100, Jeremie Courreges-Anglas wrote:
> Matthieu Herrb  writes:
> 
> > Hi,
> >
> > I ended up regenerating existing custom config files using the
> > sendmail port, and stumbled into references to the old 'smmsp'
> > user/group. So lets patch the installed cf/feature/msp.m4:
> >
> > ok ?
> 
> ok jca@
> 
> Note that if you fix msp.m4 then openbsd-submit.mc doesn't need to
> override confRUN_AS_USER anymore.
> 
Here's a new patch taking your remark and sthen@'s .

Index: Makefile
===
RCS file: /cvs/ports/mail/sendmail/Makefile,v
retrieving revision 1.13
diff -u -u -r1.13 Makefile
--- Makefile19 Jul 2015 02:25:35 -  1.13
+++ Makefile7 Mar 2016 09:04:20 -
@@ -7,6 +7,7 @@
 DISTNAME = sendmail.${V}
 PKGNAME-main = sendmail-${V}
 PKGNAME-libmilter =libmilter-${V}
+REVISION-main =0
 FULLPKGNAME-libmilter =libmilter-${V}
 FULLPKGPATH-libmilter =mail/sendmail,-libmilter
 
Index: files/cf/openbsd-submit.mc
===
RCS file: /cvs/ports/mail/sendmail/files/cf/openbsd-submit.mc,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 openbsd-submit.mc
--- files/cf/openbsd-submit.mc  16 Sep 2014 17:09:32 -  1.1.1.1
+++ files/cf/openbsd-submit.mc  7 Mar 2016 09:04:20 -
@@ -24,7 +24,6 @@
 define(`confDONT_INIT_GROUPS', `True')dnl
 define(`confCT_FILE', `-o MAIL_SETTINGS_DIR`'trusted-users')dnl
 define(`confTO_IDENT', `0')dnl
-define(`confRUN_AS_USER', `_smmsp')dnl
 FEATURE(`use_ct_file')dnl
 FEATURE(`accept_unresolvable_domains')dnl
 dnl
Index: patches/patch-cf_feature_msp_m4
===
RCS file: patches/patch-cf_feature_msp_m4
diff -N patches/patch-cf_feature_msp_m4
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-cf_feature_msp_m4 7 Mar 2016 09:04:20 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- cf/feature/msp.m4.orig Wed Mar  5 01:59:45 2014
 cf/feature/msp.m4  Mon Mar  7 09:55:28 2016
+@@ -20,7 +20,7 @@ define(`confPRIVACY_FLAGS', `goaway,noetrn,restrictqru
+ define(`confDONT_PROBE_INTERFACES', `True')
+ dnl -
+ dnl run as this user (even if called by root)
+-ifdef(`confRUN_AS_USER',,`define(`confRUN_AS_USER', `smmsp')')
++ifdef(`confRUN_AS_USER',,`define(`confRUN_AS_USER', `_smmsp')')
+ ifdef(`confTRUSTED_USER',,`define(`confTRUSTED_USER',
+ `ifelse(index(confRUN_AS_USER,`:'), -1, `confRUN_AS_USER',
+ `substr(confRUN_AS_USER,0,index(confRUN_AS_USER,`:'))')')')

-- 
Matthieu Herrb


pgpXzBfDmtZV2.pgp
Description: PGP signature

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 03:52:30

Modified files:
sysutils/tarsnap-gui: Makefile 

Log message:
Convert to MODQMAKE, -2 lines ofr Makefile.

Re: UPDATE: devel/intellij 15.0.4

[Jiri B]

On Sun, Mar 06, 2016 at 10:36:10PM +0100, Caspar Schutijser wrote:
> Hi ports@,
> 
> Below is an update of devel/intellij to 15.0.4. I tested it on amd64,
> works fine for me.

Not sure how you did your tests but intellij is far from being
fully functional on OpenBSD.

See https://github.com/idea4bsd

* fsnotifier has some issues
* i could not run virtualenv from idea
* iiuc breakgen should not work too
* cannot be built from source by default

There's a lot of checking for OS type in java code, and mostly
there's Windows, Linux, MacOS and little bit of FreeBSD.

j.

Re: [update] net/transmission

[Vadim Zhukov]

2016-03-07 3:23 GMT+03:00 Josh Grosse :
> On Sun, Mar 06, 2016 at 12:03:27AM +, Christian Weisgerber wrote:
>> ... However, as the
>> port stands now, FLAVOR="" builds those subpackages with GCC 4.9
>> from ports, but FLAVOR="no_qt" builds them with the base compiler.
>> So depending on no_qt the _other_ packages are different.  That is
>> wrong.
>
> Two additional revisions after ensuring the gcc4 module is always
> used:
>
> 1.  As gcc4 is always used, ONLY_FOR_ARCHS= ${GCC4_ARCHS}
>
> 2.  Deploy the new CONFIGURE_STYLE=gmake.  I have integrated a diff
> from Vadim Zhukov below.

This is okay zhuk@.

--
  WBR,
  Vadim Zhukov

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 03:36:35

Modified files:
devel/libqtelegram-aseman-edition: Makefile 

Log message:
Switch to MODQMAKE.

No line count changes in Makefile, since I'm too lazy to patch the .pro file.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/03/07 03:24:34

Modified files:
net/bird   : Makefile 

Log message:
build BIRD with threads, enables bfd

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 03:18:24

Modified files:
x11/cool-retro-term: Makefile 

Log message:
My favourite mission-critical port moves to MODQMAKE. -5 lines of make code.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 03:14:57

Modified files:
games/gottcode : Makefile.inc 

Log message:
Use MODQMAKE, -7 lines.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 03:13:32

Modified files:
x11/qt4: qt4.port.mk 
x11/qt5: qt5.port.mk 

Log message:
Unbreak the case of USE_SYSTRACE=Yes: we tried to run under systrace
always, and bsd.port.mk invokes systrace for us already when in do-build
or do-install target.

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/03/07 02:37:06

Modified files:
editors/texworks: Makefile 

Log message:
Convert to MODQMAKE, -20 lines of Makefile.

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2016/03/07 02:31:32

Modified files:
net/etherape   : Makefile distinfo 
Added files:
net/etherape/patches: patch-src_diagram_c 

Log message:
Update to etherape-0.9.14.

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2016/03/07 02:06:18

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

Log message:
Update to highlight-3.28.

CVS: cvs.openbsd.org: ports

[Paul Irofti]

CVSROOT:/cvs
Module name:ports
Changes by: piro...@cvs.openbsd.org 2016/03/07 01:35:18

Modified files:
www/youtube-dl : Makefile distinfo 
www/youtube-dl/pkg: PLIST 

Log message:
Update to youtube-dl 2016.03.06.

New extractors:
- aenetworks
- animeondemand
- bigflix
- bokecc
- canvas
- cbc
- crackle
- cultureunplugged
- cwtv
- digiteka
- ivideon
- konserthusetplay
- kusi
- leeco
- lemonde
- lovehomeporn
- matchtv
- noz
- npr
- nuevo
- plays
- revision3
- ruleporn
- screenjunkies
- trollvids
- twentymin
- ustudio
- weiqitv
- zippcast
Removed:
- history
- space
- testtube
- ultimedia

Update reminder and diff from Daniel Jakots, thanks!

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2016/03/07 01:18:34

Modified files:
security/libssh2: Makefile distinfo 
security/libssh2/patches: patch-tests_Makefile_in 
security/libssh2/pkg: PLIST 

Log message:
Update to libssh2-1.7.0.