CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2015/11/09 06:55:22

Modified files:
www/mozilla: mozilla.port.mk 

Log message:
fix WRKDIST for seamonkey now that it uses new layout

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2015/11/09 07:36:12

Modified files:
x11/awesome: Makefile 
x11/awesome/patches: patch-awesome_c patch-globalconf_h 
 patch-objects_client_c patch-xwindow_c 
Added files:
x11/awesome/patches: patch-common_luaclass_c patch-common_util_h 
 patch-event_c patch-luaa_c 
 patch-objects_window_c 
 patch-objects_window_h patch-spawn_c 

Log message:
Merge fixes from upstream (from the stable '3.5' branch)

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2015/11/09 05:44:20

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

Log message:
Update to mlmmj-1.2.19.0

>From Daniel Jakots, diff also tested by Eric Lalonde.  Thanks!

Re: new port: net/rabbitmq-c

[Jérémie Courrèges-Anglas]

j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:

> Gregor Best  writes:
>
>> On Mon, Oct 12, 2015 at 04:46:03PM +0200, Gregor Best wrote:
>>> On Mon, Oct 12, 2015 at 01:31:36AM +0300, Vadim Zhukov wrote:
>>> > [...]
>>> > This software changes default CMake variables depending on presence of
>>> > popt library and xmlto binary at least. So you have hidden
>>> > dependencies there. You'd either explicitly disable picking up those
>>> > by -DCMAKE_DISABLE_FIND_PACKAGE_Foo=True, or add what you think worths
>>> > it to BUILD/LIB/RUN_DEPENDS.
>>> > [...]
>>> 
>>> Whoops, fixed that. I've disabled API-doc generation because it pulls in
>>> devel/doxygen as a build dependency and explicitly added popt and xmlto
>>> to lib and build dependencies.
>>> 
>>> This one also installs the manual pages into the right place.
>>> [...]
>>
>> Ping.
>>
>> Is there something still missing about the port?
>
> A few tweaks:
> - please follow the ordering as show in
>   infrastructure/templates/Makefile.template, it helps a lot to have
>   consistency here
> - the shared library version in the OpenBSD ports tree does not follow
>   the one defined upstream, thus we start with 0.0 for a new port.  For
>   more about shared libs in ports, see
>   http://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs
>
> I think it is ready to import, can I get other reviews / oks?

ping :)



rabbitmq-c.tgz
Description: Binary data

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

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2015/11/09 06:47:09

Modified files:
converters/p5-Catalyst-View-JSON: Makefile distinfo 

Log message:
Update to p5-Catalyst-View-JSON-0.35.

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2015/11/09 06:54:30

Modified files:
www/seamonkey  : Makefile distinfo 
www/seamonkey/patches: patch-mozilla_gfx_skia_moz_build 
   patch-mozilla_intl_icu_source_Makefile_in 
   patch-suite_installer_Makefile_in 
www/seamonkey/pkg: PLIST-lightning PLIST-main 
www/seamonkey-i18n: Makefile.inc distinfo 
Added files:
www/seamonkey/patches: 
   
patch-mozilla_gfx_skia_skia_src_opts_SkBlitRow_opts_SSE4_h 
Removed files:
www/seamonkey/patches: 
   
patch-mozilla_gfx_skia_trunk_src_opts_SkBlitRow_opts_SSE4_h 

Log message:
Update to seamonkey 2.39 / lightning-seamonkey 4.4.

See http://www.seamonkey-project.org/releases/seamonkey2.39/

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2015/11/09 05:19:16

ports/net/haproxy/files

Update of /cvs/ports/net/haproxy/files
In directory cvs.openbsd.org:/tmp/cvs-serv26619/files

Log Message:
Directory /cvs/ports/net/haproxy/files added to the repository

Re: [maintainer update] update to haproxy 1.6.2

[Jérémie Courrèges-Anglas]

Daniel Jakots  writes:

> Hi,

Hi,

> So I finally succeed in updating haproxy to 1.6 branch. Thanks to
> sthen@ and jca@ for their help.

yw :)

> Upstream removed a bunch of documentation files including the
> haproxy.cfg. I created a very simple one so a new user can easily test
> haproxy (or even to check an update is still working).

The config file looks good as is.  You could also add a bunch of
SSL-related stuff later, for the same reasons.

A time_t related issue appeared in dumpstats.c; below you'll find an
additional patch, are you fine with it?

Index: Makefile
===
RCS file: /cvs/ports/net/haproxy/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile5 Nov 2015 20:00:24 -   1.25
+++ Makefile9 Nov 2015 12:30:01 -
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.25 2015/11/05 20:00:24 jca Exp $
+# $OpenBSD: Makefile,v 1.20.4.1 2015/10/24 14:34:46 ajacoutot Exp $
 
 COMMENT =  reliable, high performance TCP/HTTP load balancer
 
-DISTNAME = haproxy-1.5.15
+DISTNAME = haproxy-1.6.2
 CATEGORIES =   net www
 HOMEPAGE = http://www.haproxy.org/
 MAINTAINER =   Daniel Jakots 
@@ -12,7 +12,7 @@ PERMIT_PACKAGE_CDROM =Yes
 
 WANTLIB =  c crypto pcre pcreposix ssl
 
-MASTER_SITES = ${HOMEPAGE}/download/1.5/src/
+MASTER_SITES = ${HOMEPAGE}/download/1.6/src/
 
 HAPROXYCONF =  ${SYSCONFDIR}/haproxy
 HAPROXYSTATE = /var/haproxy
@@ -35,16 +35,15 @@ MAKE_FLAGS +=   USE_PRIVATE_CACHE=1
 NO_TEST =  Yes
 LIB_DEPENDS =  devel/pcre
 
-DOCS = architecture configuration gpl haproxy-en haproxy-fr lgpl
-EXAMPLES = acl-content-sw content-sw-sample haproxy \
-   option-http_proxy tarpit url-switching
+DOCS = architecture configuration gpl lgpl
+EXAMPLES = acl-content-sw content-sw-sample option-http_proxy 
 
 DOCSDIR =  ${PREFIX}/share/doc/haproxy
 EXAMPLESDIR =  ${PREFIX}/share/examples/haproxy
 
 
 pre-install:
-   ${SUBST_CMD} ${WRKSRC}/doc/haproxy.1 ${WRKSRC}/examples/haproxy.cfg
+   ${SUBST_CMD} ${WRKSRC}/doc/haproxy.1
 
 do-install:
${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin
@@ -57,6 +56,7 @@ do-install:
 .for file in ${EXAMPLES}
${INSTALL_DATA} ${WRKSRC}/examples/${file}.cfg ${EXAMPLESDIR}
 .endfor
+   ${INSTALL_DATA} ${FILESDIR}/haproxy.cfg ${EXAMPLESDIR}
 
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/net/haproxy/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo5 Nov 2015 20:00:24 -   1.13
+++ distinfo9 Nov 2015 12:30:01 -
@@ -1,2 +1,2 @@
-SHA256 (haproxy-1.5.15.tar.gz) = WvRuFDhgHQkZ9WKAgfZg+VMwh9iK89knTyRTlUdWY+E=
-SIZE (haproxy-1.5.15.tar.gz) = 1356790
+SHA256 (haproxy-1.6.2.tar.gz) = vUp+7nnhv9Ja9Z2Va7YOgqy7bxRvP7OzBjYDb0yVSNM=
+SIZE (haproxy-1.6.2.tar.gz) = 1538976
Index: files/haproxy.cfg
===
RCS file: files/haproxy.cfg
diff -N files/haproxy.cfg
--- /dev/null   1 Jan 1970 00:00:00 -
+++ files/haproxy.cfg   9 Nov 2015 12:30:01 -
@@ -0,0 +1,25 @@
+global
+   log 127.0.0.1   local0 debug
+   maxconn 1024
+   chroot /var/haproxy
+   uid 604
+   gid 604
+   daemon
+   pidfile /var/run/haproxy.pid
+
+defaults
+   log global
+   modehttp
+   option  httplog
+   option  dontlognull
+   option  redispatch
+   retries 3
+   maxconn 2000
+
+frontend haproxy
+   bind *:80
+   default_backend httpd
+
+backend httpd
+   option forwardfor
+   server www 127.0.0.1:8080 check
Index: patches/patch-examples_haproxy_cfg
===
RCS file: patches/patch-examples_haproxy_cfg
diff -N patches/patch-examples_haproxy_cfg
--- patches/patch-examples_haproxy_cfg  17 Jul 2008 04:31:45 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,63 +0,0 @@
-$OpenBSD: patch-examples_haproxy_cfg,v 1.1.1.1 2008/07/17 04:31:45 jdixon Exp $
 examples/haproxy.cfg.orig  Sat Jun 21 15:59:05 2008
-+++ examples/haproxy.cfg   Sun Jul 13 20:13:01 2008
-@@ -1,28 +1,30 @@
--# this config needs haproxy-1.1.28 or haproxy-1.2.1
- 
- global
-   log 127.0.0.1   local0
-   log 127.0.0.1   local1 notice
-   #log loghostlocal0 info
--  maxconn 4096
--  chroot /usr/share/haproxy
--  uid 99
--  gid 99
-+  maxconn 1024
-+  chroot ${HAPROXYSTATE}
-+  uid ${HAPROXYUID}
-+  gid ${HAPROXYGID}
-   daemon
-   #debug
-   #quiet
-+  pidfile /var/run/haproxy.pid
- 
- defaults
-   log global
-   modehttp
-   option  httplog
-   option  dontlognull
-+  option  redispatch
-   retries 3
--  redispatch
-   maxconn 2000
-   contimeout  5000
-   clitimeout  5
-   

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2015/11/09 05:23:26

Modified files:
devel/p5-Scope-Guard: Makefile distinfo 

Log message:
Update to p5-Scope-Guard-0.21.

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2015/11/09 05:15:37

Modified files:
devel/p5-Test-NoTabs: Makefile distinfo 

Log message:
Update to p5-Test-NoTabs-1.4.

Re: update mail/mlmmj

[Jérémie Courrèges-Anglas]

Eric Lalonde  writes:

> On 11/5/15 11:36 PM, Daniel Jakots wrote:
>> Hi,
>>
>> Here's an update for mlmmj to the latest release.
>>
>> The short changelog is:
>> - Ensuring OpenSMTPD sends 8-bit mail so it works with non-ASCII mail
>> - Improved handling of non-ASCII mail and long headers
>> - Tunable for moderation request lifetime
>> - Fix relayhost and related tunables which didn't work in some
>>circumstances
>>
>> I don't use it, so please test it if you use it :)
>
> Applied and lightly tested so far. Seems to be working fine.

Committed, thanks!

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

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/09 06:13:58

Modified files:
x11/gnome/gvfs : Makefile distinfo 

Log message:
Update to gvfs-1.26.2.

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2015/11/09 05:50:17

Modified files:
games/manaplus : Makefile distinfo 
games/manaplus/pkg: PLIST 

Log message:
Update to manaplus-1.5.11.7.

Re: [UPDATE] x11/dwm

[Ted Unangst]

Joerg Jung wrote:
> Hi,
> 
> please find below an update for x11/dwm to 6.1.  This release contains
> various fixes and improvements, see announcement [1] for more details.
> 
> OK?

so now that we finally changed the default xterm back to uxterm, they changed
it to st. needs another man page patch. :)

Re: [UPDATE] x11/dwm

[Joerg Jung]

On Mon, Nov 09, 2015 at 04:07:56PM -0500, Ted Unangst wrote:
> Joerg Jung wrote:
> > Hi,
> > 
> > please find below an update for x11/dwm to 6.1.  This release contains
> > various fixes and improvements, see announcement [1] for more details.
> > 
> > OK?
> 
> so now that we finally changed the default xterm back to uxterm, they changed
> it to st. needs another man page patch. :)

You are right. Updated diff including man page patch below.


Index: Makefile
===
RCS file: /cvs/ports/x11/dwm/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile25 Oct 2015 14:23:07 -  1.26
+++ Makefile9 Nov 2015 21:30:56 -
@@ -2,8 +2,7 @@
 
 COMMENT=   dynamic window manager
 
-DISTNAME=  dwm-6.0
-REVISION=  1
+DISTNAME=  dwm-6.1
 
 CATEGORIES=x11
 
@@ -18,7 +17,7 @@ WANTLIB=  X11 Xinerama c
 
 MASTER_SITES=  http://dl.suckless.org/dwm/
 
-RUN_DEPENDS=   x11/dmenu>=4.4 \
+RUN_DEPENDS=   x11/dmenu>=4.6 \
fonts/terminus-font
 
 MAKE_ENV=  LDFLAGS="${LDFLAGS}"
Index: distinfo
===
RCS file: /cvs/ports/x11/dwm/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo18 Jan 2015 03:15:53 -  1.18
+++ distinfo9 Nov 2015 21:30:56 -
@@ -1,2 +1,2 @@
-SHA256 (dwm-6.0.tar.gz) = srlIPeaSWe7qVoRImbsjhRWNPnmkLYKxDBQgmfyO61Y=
-SIZE (dwm-6.0.tar.gz) = 20810
+SHA256 (dwm-6.1.tar.gz) = wvbFYWfwrNvj3DfMqcGhkmDAQPLUgA41KaIa18zidf4=
+SIZE (dwm-6.1.tar.gz) = 25887
Index: patches/patch-config_def_h
===
RCS file: /cvs/ports/x11/dwm/patches/patch-config_def_h,v
retrieving revision 1.10
diff -u -p -r1.10 patch-config_def_h
--- patches/patch-config_def_h  25 Oct 2015 14:23:07 -  1.10
+++ patches/patch-config_def_h  9 Nov 2015 21:30:56 -
@@ -1,18 +1,21 @@
 $OpenBSD: patch-config_def_h,v 1.10 2015/10/25 14:23:07 jung Exp $
 config.def.h.orig  Mon Dec 19 16:02:46 2011
-+++ config.def.h   Thu Oct  8 20:58:14 2015
-@@ -1,13 +1,13 @@
- /* See LICENSE file for copyright and license details. */
+--- config.def.h.orig  Sun Nov  8 23:39:37 2015
 config.def.h   Mon Nov  9 21:23:42 2015
+@@ -2,15 +2,15 @@
  
  /* appearance */
--static const char font[]= 
"-*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*";
+ static const char *fonts[] = {
+-  "monospace:size=10"
++  "terminus:size=8"
+ };
+-static const char dmenufont[]   = "monospace:size=10";
 -static const char normbordercolor[] = "#44";
 -static const char normbgcolor[] = "#22";
 -static const char normfgcolor[] = "#bb";
 -static const char selbordercolor[]  = "#005577";
 -static const char selbgcolor[]  = "#005577";
 -static const char selfgcolor[]  = "#ee";
-+static const char font[]= 
"-*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*";
++static const char dmenufont[]   = "terminus:size=8";
 +static const char normbordercolor[] = "#404040";
 +static const char normbgcolor[] = "#202020";
 +static const char normfgcolor[] = "#c0c0c0";
@@ -21,13 +24,22 @@ $OpenBSD: patch-config_def_h,v 1.10 2015
 +static const char selfgcolor[]  = "#f0f0f0";
  static const unsigned int borderpx  = 1;/* border pixel of windows */
  static const unsigned int snap  = 32;   /* snap pixel */
- static const Bool showbar   = True; /* False means no bar */
-@@ -20,6 +20,8 @@ static const Rule rules[] = {
+ static const int showbar= 1;/* 0 means no bar */
+@@ -27,6 +27,8 @@ static const Rule rules[] = {
/* class  instancetitle   tags mask isfloating   
monitor */
-   { "Gimp", NULL,   NULL,   0,True,-1 },
-   { "Firefox",  NULL,   NULL,   1 << 8,   False,   -1 },
-+  { "Xonix",NULL,   NULL,   0,True,-1 },
-+  { NULL,   NULL,   "glxgears", 0,True,-1 },
+   { "Gimp", NULL,   NULL,   0,1,   -1 },
+   { "Firefox",  NULL,   NULL,   1 << 8,   0,   -1 },
++  { "Xonix",NULL,   NULL,   0,1,   -1 },
++  { NULL,   NULL,   "glxgears", 0,1,   -1 },
  };
  
  /* layout(s) */
+@@ -55,7 +57,7 @@ static const Layout layouts[] = {
+ /* commands */
+ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in 
spawn() */
+ static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", 
dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", 
selfgcolor, NULL };
+-static const char *termcmd[]  = { "st", NULL };
++static const char *termcmd[]  = { "uxterm", NULL };
+ 
+ static Key keys[] = {
+   /* 

Re: [UPDATE} mail/abook 0.6.1

[Stuart Henderson]

On 2015/11/07 12:56, J. Scott Heppler wrote:
> Correct subject line for update.  Portcheck had a tailing whitespace
> error in DESCR using the 0.5.6 DESCR.  The error was in the line
> to set the mutt query line in muttrc.  I added the missing period
> but the case could be made to tolerate the whitespace to avoid copy
> -paste errors.
> 
> Builds/Runs on amd64-current, amd64-5.8 and i386-5.8
> Tested colors in rxvt-unicode, importing Vcards and editing phone
> numbers along with routine use for 2 days.
> 
> I have had trouble with the formating of inline diffs in the past.
> I used xclip to generate this one and change my default editor from
> gvim -> vi in my muttrc.

some quick comments inline below, somewhere between generating the
diff and it being mailed out there was still some mangling though, so it
can't be applied directly.

> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/abook/Makefile,v
> retrieving revision 1.31
> diff -u -p -u -p -r1.31 Makefile
> --- Makefile29 Jun 2015 15:39:43 -  1.31
> +++ Makefile6 Nov 2015 19:22:41 -
> @@ -1,33 +1,36 @@
> -# $OpenBSD: Makefile,v 1.31 2015/06/29 15:39:43 sthen Exp $
> +# $OpenBSD: Makefile,v 1.31 2015/11/06 15:39:43 jsh Exp $

just leave this line as-is, it's handled by cvs.

> -COMMENT=   addressbook program with mutt support
> +COMMENT =   addressbook program with mutt support

mixing whitespace changes ("=" to " =") with an update makes it more
difficult to review.

> -DISTNAME=  abook-0.5.6
> -REVISION=  2
> -CATEGORIES=mail
> +V = 0.6.1
> +DISTNAME =  abook-${V}

no need for indirection here, you're not reusing V

> +CATEGORIES =mail
> 
> -HOMEPAGE=  http://abook.sourceforge.net/
> +
> +HOMEPAGE =  http://abook.sourceforge.net/

no need for 2 blank lines above HOMEPAGE

> 
> # GPLv2
> -PERMIT_PACKAGE_CDROM=  Yes
> +PERMIT_PACKAGE_CDROM =  Yes
> +
> +WANTLIB+=   c  ncursesw readline

awkward whitespace

> 
> -WANTLIB += c ncursesw readline
> +MASTER_SITES =  http://abook.sourceforge.net/devel/
> 
> -MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=abook/}
> +MODULES =   devel/gettext \
> +   converters/libiconv

looks like some tabs/spaces issue here

> 
> -MODULES=   devel/gettext
> 
> -CONFIGURE_STYLE=gnu
> +CONFIGURE_STYLE =   gnu
> +AUTOCONF_VERSION = 2.69
> +AUTOMAKE_VERSION = 1.14
> 
> -EXAMPLESDIR=   ${PREFIX}/share/examples/abook
> -WHITELIST=README abook2whitelist.sh mutt.whitelist whitelist.rc
> +pre-configure:
> +   @cd ${WRKSRC}; env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
> +   AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoreconf -i
> 
> post-install:
> -   ${INSTALL_DATA_DIR} ${EXAMPLESDIR}/whitelist
> -   ${INSTALL_DATA} ${WRKSRC}/contrib/mail2abook.py ${EXAMPLESDIR}
> -   ${INSTALL_DATA} ${WRKSRC}/contrib/vcard2abook.pl ${EXAMPLESDIR}
> -   cd ${WRKSRC}/contrib/whitelist && \
> -   ${INSTALL_DATA} ${WHITELIST} ${EXAMPLESDIR}/whitelist
> -   ${INSTALL_DATA} ${WRKSRC}/sample.abookrc ${EXAMPLESDIR}
> +   mkdir ${PREFIX}/share/examples/abook/

use ${INSTALL_DATA_DIR}

> +   cp ${WRKSRC}/sample.abookrc $ ${PREFIX}/share/examples/abook/

use ${INSTALL_DATA}, remove stray $

> 
> .include 
> +

remove trailing blank line

> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/abook/distinfo,v
> retrieving revision 1.11
> diff -u -p -u -p -r1.11 distinfo
> --- distinfo18 Jan 2015 03:14:20 -  1.11
> +++ distinfo6 Nov 2015 19:22:41 -
> @@ -1,2 +1,2 @@
> -SHA256 (abook-0.5.6.tar.gz) = Bkb2MRqUrTNBgSpN4SpalAp6RNXLbp2lsJMKrp9EdW4=
> -SIZE (abook-0.5.6.tar.gz) = 393097
> +SHA256 (abook-0.6.1.tar.gz) = 8KkN+GlPs0aF7N1F2X2yi4gEbBXJXnsHAFlgKL2LwPk=
> +SIZE (abook-0.6.1.tar.gz) = 319558
> Index: pkg/DESCR
> ===
> RCS file: /cvs/ports/mail/abook/pkg/DESCR,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 DESCR
> --- pkg/DESCR   22 Sep 2010 08:59:07 -  1.4
> +++ pkg/DESCR   6 Nov 2015 19:22:41 -
> @@ -1,10 +1,7 @@
> Addressbook program with mutt mail client support.
> 
> -abook uses curses libs and is able to import addressbooks from
> -pine and netscape (ldif).
> -Exports to mutt alias, html, pine, gcrd (GnomeCard), csv, elm -alias, and
> plain text.
> +abook uses curses libs and is able to import and export from other 
> addressbook
> +formats.

removing the list of supported formats seems like a step backwards

> 
> -It is nice for querying from within mutt; to use it as such, add
> -the following to your muttrc:
> -set query_command="${PREFIX}/bin/abook --mutt-query '%s'"
> +It is nice for querying from within mutt; to use it as such, add the 
> following
> +to your muttrc: set 

Re: [UPDATE] x11/dwm

[Ingo Schwarze]

Hi Joerg,

Joerg Jung wrote on Mon, Nov 09, 2015 at 10:31:10PM +0100:

> Index: patches/patch-dwm_1
> ===
> RCS file: patches/patch-dwm_1
> diff -N patches/patch-dwm_1
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-dwm_1   9 Nov 2015 21:30:56 -
> @@ -0,0 +1,21 @@
> +$OpenBSD$
> +--- dwm.1.orig   Mon Nov  9 22:25:40 2015
>  dwm.1Mon Nov  9 22:26:32 2015
> +@@ -57,7 +57,7 @@ click on a tag label adds/removes that tag to/from the
> + .TP
> + .B Mod1\-Shift\-Return
> + Start
> +-.BR st(1).
> ++.BR uxterm(1).

The line

  .BR uxterm(1).

makes no sense.  You don't need a font alternation macro if you
just have one single argument.

>From .Xr, mandoc -Tman produces just "uxterm(1)" without any
markup.  The man(7) manual recommends ".BR uxterm ( 1 ).",
i.e. keeping the punctuation out of bold face.  But for
consistency with the rest of the page, you probably want

  .BR uxterm (1).

Oh well, there is no consistent style for man(7) manuals, anyway.

This is not a comment on the port update - the words "man page patch"
just triggered my curiosity.  :-)

Yours,
  Ingo


> + .TP
> + .B Mod1\-,
> + Focus previous screen, if any.
> +@@ -151,7 +151,7 @@ dwm is customized by creating a custom config.h and (r
> + code. This keeps it fast, secure and simple.
> + .SH SEE ALSO
> + .BR dmenu (1),
> +-.BR st (1)
> ++.BR uxterm (1)
> + .SH BUGS
> + Java applications which use the XToolkit/XAWT backend may draw grey windows
> + only. The XToolkit/XAWT backend breaks ICCCM-compliance in recent JDK 1.5 
> and early
> 

Re: Vulnerable packages in ports tree 10/11

[Sevan / Venture37]

www/p5-HTML-Scrubber -
http://jvndb.jvn.jp/en/contents/2015/JVNDB-2015-000171.html

Vulnerable packages in ports tree 10/11

[Sevan / Venture37]

net/ntp
http://support.ntp.org/bin/view/Main/SecurityNotice#October_2015_NTP_Security_Vulner
databases/mariadb
https://mariadb.com/kb/en/mariadb/mariadb-10022-release-notes/
archivers/unzip CVE-2015-7696 CVE-2015-7697
net/openafs https://www.openafs.org/pages/security/OPENAFS-SA-2015-007.txt

[PATCH] x11/wmii for dmenu changes

[trondd]

Patched the config/rc scripts to maintain the existing default font when
using the new dmenu.

Tim.


Index: Makefile
===
RCS file: /cvs/ports/x11/wmii/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile16 Feb 2015 22:57:14 -  1.20
+++ Makefile10 Nov 2015 01:41:34 -
@@ -3,7 +3,7 @@
 COMMENT=   dynamic window manager

 DISTNAME=  wmii-3.6
-REVISION=  5
+REVISION=  6
 CATEGORIES=x11

 HOMEPAGE=  http://wmii.suckless.org/
cvs server: Diffing patches
Index: patches/patch-rc_rc_wmii_rc
===
RCS file: patches/patch-rc_rc_wmii_rc
diff -N patches/patch-rc_rc_wmii_rc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-rc_rc_wmii_rc 10 Nov 2015 01:41:34 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+--- rc/rc.wmii.rc.orig Mon Nov  9 20:22:02 2015
 rc/rc.wmii.rc  Mon Nov  9 20:23:01 2015
+@@ -37,6 +37,7 @@ LEFT=h
+ RIGHT=l
+
+ WMII_FONT='-*-fixed-medium-r-*-*-13-*-*-*-*-*-*-*'
++DMENU_FONT='Fixed-10'
+ WMII_NORMCOLORS=('#88' '#22' '#33')
+ WMII_FOCUSCOLORS=('#ff' '#285577' '#4C7899')
+ WMII_BACKGROUND='#33'
+@@ -63,7 +64,7 @@ fn viewtitle { echo $* }
+
+ # Convenience Functions
+ fn wmiimenu {
+-  dmenu -b -fn $WMII_FONT \
++  dmenu -b -fn $DMENU_FONT \
+   -nf $WMII_NORMCOLORS(1) -nb $WMII_NORMCOLORS(2) \
+   -sf $WMII_FOCUSCOLORS(1) -sb $WMII_FOCUSCOLORS(2)
+ }
Index: patches/patch-rc_sh_wmii
===
RCS file: patches/patch-rc_sh_wmii
diff -N patches/patch-rc_sh_wmii
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-rc_sh_wmii10 Nov 2015 01:41:34 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+--- rc/sh.wmii.origMon Nov  9 20:23:13 2015
 rc/sh.wmii Mon Nov  9 20:24:18 2015
+@@ -17,6 +17,7 @@ LEFT=h
+ RIGHT=l
+
+ WMII_FONT=fixed
++DMENU_FONT='Fixed-10'
+ WMII_NORMCOLORS=('#22' '#5FBF77' '#2A7F3F')
+ WMII_FOCUSCOLORS=('#ff' '#153F1F' '#2A7F3F')
+ WMII_BACKGROUND='#33'
+@@ -26,7 +27,7 @@ WMII_TERM=urxvt
+ fn wmiimenu {
+   (nf nb nil sf sb nil) := ($WMII_NORMCOLORS $WMII_FOCUSCOLORS)
+   os -d ${hostenv HOME} (
+-  dmenu -b -fn $WMII_FONT
++  dmenu -b -fn $DMENU_FONT
+   -nf $nf -nb $nb -sf $sf -sb $sb)
+ }
+
Index: patches/patch-rc_wmiirc_sh
===
RCS file: patches/patch-rc_wmiirc_sh
diff -N patches/patch-rc_wmiirc_sh
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-rc_wmiirc_sh  10 Nov 2015 01:41:34 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- rc/wmiirc.sh.orig  Mon Nov  9 20:20:45 2015
 rc/wmiirc.sh   Mon Nov  9 20:25:28 2015
+@@ -14,9 +14,10 @@ WMII_FOCUSCOLORS='#ff #285577 #4c7899'
+
+ WMII_BACKGROUND='#33'
+ WMII_FONT='-*-fixed-medium-r-*-*-13-*-*-*-*-*-*-*'
++DMENU_FONT='Fixed-10'
+
+ set -- $(echo $WMII_NORMCOLORS $WMII_FOCUSCOLORS)
+-WMII_MENU="dmenu -b -fn '$WMII_FONT' -nf '$1' -nb '$2' -sf '$4' -sb '$5'"
++WMII_MENU="dmenu -b -fn '$DMENU_FONT' -nf '$1' -nb '$2' -sf '$4' -sb '$5'"
+ WMII_9MENU="wmii9menu -font '$WMII_FONT' -nf '$1' -nb '$2' -sf '$4' -sb
'$5' -br '$6'"
+ WMII_TERM="xterm"
+
+@@ -168,7 +169,7 @@ grabmod $MODKEY
+ border 1
+ EOF
+
+-export WMII_MENU WMII_9MENU WMII_FONT WMII_TERM
++export WMII_MENU WMII_9MENU WMII_FONT DMENU_FONT WMII_TERM
+ export WMII_FOCUSCOLORS WMII_SELCOLORS WMII_NORMCOLORS
+
+ # Feed events to `wmiiloop' for processing

Re: NEW: textproc/wkhtmltopdf

[Amit Kulkarni]

On Thu, Nov 5, 2015 at 1:26 PM, Frank Groeneveld <
frank+openbsd-po...@frankgroeneveld.nl> wrote:

> On 11/04/15 22:34, Stuart Henderson wrote:
>
>> Done. (I also added a blank line before the COMMENT).
>>
>
> Thank you!
>
> Seems pretty common for Qt things unfortunately. phantomjs needs a
>> patched Qt too, calibre uses private interfaces so it needs a :patch
>> target to find the headers...
>>
>
> Yes, I saw the phanomjs port indeed. I've built wkhtmltopdf with it's
> statically linked, patched QT and needed a few patches from the phantomjs
> port to get it going. It seems however, phantomjs is always statically
> build against the patched qt.
>
> I wonder how much time it would add to builds, it loses a lot of
>> features without the patched Qt (and I have somewhere I might
>> want to use that too).
>>
>
> On my computer the current port builds within minutes, while the build
> with patched QT takes around one hour.
>
> I'll try to make a port for it, I got it building a few weeks ago:
> https://github.com/wkhtmltopdf/wkhtmltopdf/issues/1991
>
>
I asked the upstream author privately, and he said that if you prefer the
stock qt4 or the "unpatched" as he calls it, you can switch as well to the
qt5 in ports.

Thanks

[UPDATE] x11/dwm

[Joerg Jung]

Hi,

please find below an update for x11/dwm to 6.1.  This release contains
various fixes and improvements, see announcement [1] for more details.

OK?

Thanks,
Regards,
Joerg

[1] http://lists.suckless.org/dev/1511/27504.html



Index: Makefile
===
RCS file: /cvs/ports/x11/dwm/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile25 Oct 2015 14:23:07 -  1.26
+++ Makefile9 Nov 2015 20:31:02 -
@@ -2,8 +2,7 @@
 
 COMMENT=   dynamic window manager
 
-DISTNAME=  dwm-6.0
-REVISION=  1
+DISTNAME=  dwm-6.1
 
 CATEGORIES=x11
 
@@ -18,7 +17,7 @@ WANTLIB=  X11 Xinerama c
 
 MASTER_SITES=  http://dl.suckless.org/dwm/
 
-RUN_DEPENDS=   x11/dmenu>=4.4 \
+RUN_DEPENDS=   x11/dmenu>=4.6 \
fonts/terminus-font
 
 MAKE_ENV=  LDFLAGS="${LDFLAGS}"
Index: distinfo
===
RCS file: /cvs/ports/x11/dwm/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo18 Jan 2015 03:15:53 -  1.18
+++ distinfo9 Nov 2015 20:31:02 -
@@ -1,2 +1,2 @@
-SHA256 (dwm-6.0.tar.gz) = srlIPeaSWe7qVoRImbsjhRWNPnmkLYKxDBQgmfyO61Y=
-SIZE (dwm-6.0.tar.gz) = 20810
+SHA256 (dwm-6.1.tar.gz) = wvbFYWfwrNvj3DfMqcGhkmDAQPLUgA41KaIa18zidf4=
+SIZE (dwm-6.1.tar.gz) = 25887
Index: patches/patch-config_def_h
===
RCS file: /cvs/ports/x11/dwm/patches/patch-config_def_h,v
retrieving revision 1.10
diff -u -p -r1.10 patch-config_def_h
--- patches/patch-config_def_h  25 Oct 2015 14:23:07 -  1.10
+++ patches/patch-config_def_h  9 Nov 2015 20:31:02 -
@@ -1,18 +1,21 @@
 $OpenBSD: patch-config_def_h,v 1.10 2015/10/25 14:23:07 jung Exp $
 config.def.h.orig  Mon Dec 19 16:02:46 2011
-+++ config.def.h   Thu Oct  8 20:58:14 2015
-@@ -1,13 +1,13 @@
- /* See LICENSE file for copyright and license details. */
+--- config.def.h.orig  Sun Nov  8 23:39:37 2015
 config.def.h   Mon Nov  9 21:23:42 2015
+@@ -2,15 +2,15 @@
  
  /* appearance */
--static const char font[]= 
"-*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*";
+ static const char *fonts[] = {
+-  "monospace:size=10"
++  "terminus:size=8"
+ };
+-static const char dmenufont[]   = "monospace:size=10";
 -static const char normbordercolor[] = "#44";
 -static const char normbgcolor[] = "#22";
 -static const char normfgcolor[] = "#bb";
 -static const char selbordercolor[]  = "#005577";
 -static const char selbgcolor[]  = "#005577";
 -static const char selfgcolor[]  = "#ee";
-+static const char font[]= 
"-*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*";
++static const char dmenufont[]   = "terminus:size=8";
 +static const char normbordercolor[] = "#404040";
 +static const char normbgcolor[] = "#202020";
 +static const char normfgcolor[] = "#c0c0c0";
@@ -21,13 +24,22 @@ $OpenBSD: patch-config_def_h,v 1.10 2015
 +static const char selfgcolor[]  = "#f0f0f0";
  static const unsigned int borderpx  = 1;/* border pixel of windows */
  static const unsigned int snap  = 32;   /* snap pixel */
- static const Bool showbar   = True; /* False means no bar */
-@@ -20,6 +20,8 @@ static const Rule rules[] = {
+ static const int showbar= 1;/* 0 means no bar */
+@@ -27,6 +27,8 @@ static const Rule rules[] = {
/* class  instancetitle   tags mask isfloating   
monitor */
-   { "Gimp", NULL,   NULL,   0,True,-1 },
-   { "Firefox",  NULL,   NULL,   1 << 8,   False,   -1 },
-+  { "Xonix",NULL,   NULL,   0,True,-1 },
-+  { NULL,   NULL,   "glxgears", 0,True,-1 },
+   { "Gimp", NULL,   NULL,   0,1,   -1 },
+   { "Firefox",  NULL,   NULL,   1 << 8,   0,   -1 },
++  { "Xonix",NULL,   NULL,   0,1,   -1 },
++  { NULL,   NULL,   "glxgears", 0,1,   -1 },
  };
  
  /* layout(s) */
+@@ -55,7 +57,7 @@ static const Layout layouts[] = {
+ /* commands */
+ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in 
spawn() */
+ static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", 
dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", 
selfgcolor, NULL };
+-static const char *termcmd[]  = { "st", NULL };
++static const char *termcmd[]  = { "uxterm", NULL };
+ 
+ static Key keys[] = {
+   /* modifier keyfunctionargument */
Index: patches/patch-config_mk
===
RCS file: /cvs/ports/x11/dwm/patches/patch-config_mk,v

[UPDATE] x11/dmenu

[Joerg Jung]

Hi,

please find below an update for x11/dmenu to 4.6. This release contains
a lot fixes and improvements, see announcement [1] for more details.

OK?

Thanks,
Regards,
Joerg

[1] http://lists.suckless.org/dev/1511/27503.html



Index: Makefile
===
RCS file: /cvs/ports/x11/dmenu/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile11 Mar 2013 11:46:08 -  1.20
+++ Makefile9 Nov 2015 20:30:51 -
@@ -1,8 +1,7 @@
 # $OpenBSD: Makefile,v 1.20 2013/03/11 11:46:08 espie Exp $
 
 COMMENT=   dynamic menu for X11
-DISTNAME=  dmenu-4.5
-REVISION=  0
+DISTNAME=  dmenu-4.6
 
 CATEGORIES=x11
 HOMEPAGE=  http://tools.suckless.org/dmenu
@@ -15,6 +14,8 @@ PERMIT_PACKAGE_CDROM= Yes
 WANTLIB=   X11 Xinerama c
 
 MASTER_SITES=  http://dl.suckless.org/tools/
+
+RUN_DEPENDS=   fonts/terminus-font
 
 FAKE_FLAGS=DESTDIR=""
 
Index: distinfo
===
RCS file: /cvs/ports/x11/dmenu/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo18 Jan 2015 03:15:53 -  1.14
+++ distinfo9 Nov 2015 20:30:51 -
@@ -1,2 +1,2 @@
-SHA256 (dmenu-4.5.tar.gz) = CCzWmNghJcoLOYkAb7hKxGdcKlWFv1u4rw6gnPuVqFA=
-SIZE (dmenu-4.5.tar.gz) = 11543
+SHA256 (dmenu-4.6.tar.gz) = SnokAIpiHDzWVhVa2Rq4E2248NO57Fba/uxRjKvalrM=
+SIZE (dmenu-4.6.tar.gz) = 15057
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/x11/dmenu/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile  1 May 2012 04:40:03 -   1.2
+++ patches/patch-Makefile  9 Nov 2015 20:30:51 -
@@ -1,19 +1,21 @@
 $OpenBSD: patch-Makefile,v 1.2 2012/05/01 04:40:03 gsoares Exp $
 Makefile.orig  Tue Apr  3 12:17:59 2012
-+++ Makefile   Tue Apr  3 12:19:29 2012
-@@ -16,17 +16,17 @@ options:
+--- Makefile.orig  Sun Nov  8 23:42:21 2015
 Makefile   Mon Nov  9 20:31:51 2015
+@@ -16,7 +16,7 @@ options:
  
  .c.o:
-   @echo CC -c $<
--  @${CC} -c $< ${CFLAGS}
-+  ${CC} -c $< ${CFLAGS}
+   @echo CC $<
+-  @${CC} -c ${CFLAGS} $<
++  ${CC} -c ${CFLAGS} $<
  
- ${OBJ}: config.mk draw.h
+ config.h:
+   @echo creating $@ from config.def.h
+@@ -26,11 +26,11 @@ ${OBJ}: arg.h config.h config.mk drw.h
  
- dmenu: dmenu.o draw.o
+ dmenu: dmenu.o drw.o util.o
@echo CC -o $@
--  @${CC} -o $@ dmenu.o draw.o ${LDFLAGS}
-+  ${CC} -o $@ dmenu.o draw.o ${LDFLAGS}
+-  @${CC} -o $@ dmenu.o drw.o util.o ${LDFLAGS}
++  ${CC} -o $@ dmenu.o drw.o util.o ${LDFLAGS}
  
  stest: stest.o
@echo CC -o $@
Index: patches/patch-config_def_h
===
RCS file: patches/patch-config_def_h
diff -N patches/patch-config_def_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-config_def_h  9 Nov 2015 20:30:51 -
@@ -0,0 +1,22 @@
+$OpenBSD$
+--- config.def.h.orig  Sun Nov  8 23:42:21 2015
 config.def.h   Mon Nov  9 21:05:22 2015
+@@ -4,13 +4,13 @@
+ static int topbar = 1;  /* -b  option; if 0, dmenu 
appears at bottom */
+ /* -fn option overrides fonts[0]; default X11 font or font set */
+ static const char *fonts[] = {
+-  "monospace:size=10"
++  "terminus:size=8"
+ };
+ static const char *prompt  = NULL;  /* -p  option; prompt to the elft 
of input field */
+-static const char *normbgcolor = "#22"; /* -nb option; normal background  
   */
+-static const char *normfgcolor = "#bb"; /* -nf option; normal foreground  
   */
+-static const char *selbgcolor  = "#005577"; /* -sb option; selected 
background   */
+-static const char *selfgcolor  = "#ee"; /* -sf option; selected 
foreground   */
++static const char *normbgcolor = "#202020"; /* -nb option; normal background  
   */
++static const char *normfgcolor = "#c0c0c0"; /* -nf option; normal foreground  
   */
++static const char *selbgcolor  = "#404040"; /* -sb option; selected 
background   */
++static const char *selfgcolor  = "#f0f0f0"; /* -sf option; selected 
foreground   */
+ static const char *outbgcolor  = "#00";
+ static const char *outfgcolor  = "#00";
+ /* -l option; if nonzero, dmenu uses vertical list with given number of lines 
*/
Index: patches/patch-config_mk
===
RCS file: /cvs/ports/x11/dmenu/patches/patch-config_mk,v
retrieving revision 1.10
diff -u -p -r1.10 patch-config_mk
--- patches/patch-config_mk 1 May 2012 04:40:03 -   1.10
+++ patches/patch-config_mk 9 Nov 2015 20:30:51 -
@@ -1,8 +1,8 @@
 $OpenBSD: patch-config_mk,v 1.10 2012/05/01 04:40:03 gsoares 

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

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

Modified files:
x11/gnome/getting-started-docs: Makefile distinfo 

Log message:
Update to gnome-getting-started-docs-3.18.2.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/10 00:06:45

Modified files:
x11/gnome/orca : Makefile distinfo 

Log message:
Update to orca-3.18.2.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

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

Modified files:
x11/gnome/desktop: Makefile distinfo 

Log message:
Update to gnome-desktop-3.18.2.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/09 23:58:08

Modified files:
graphics/gdk-pixbuf2: Makefile distinfo 

Log message:
Update to gdk-pixbuf-2.32.2.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/09 23:54:52

Modified files:
x11/gnome/aisleriot: Makefile distinfo 

Log message:
Update to aisleriot-3.18.2.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

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

Modified files:
x11/gnome/maps : Makefile distinfo 
x11/gnome/maps/pkg: PLIST 

Log message:
Update to gnome-maps-3.18.2.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

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

Modified files:
meta/gnome : Makefile 

Log message:
Welcome GNOME 3.18.2!

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

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

Modified files:
textproc/icu4c : Makefile distinfo 

Log message:
Update to icu4c-56.1.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/10 00:02:09

Modified files:
productivity/tryton/tryton: Makefile distinfo 

Log message:
Update to tryton-3.2.11.

[no subject]

[Gabriel Villa]

Re: [UPDATE] x11/dmenu

[Stuart Henderson]

On 2015/11/09 21:42, Joerg Jung wrote:
> Hi,
> 
> please find below an update for x11/dmenu to 4.6. This release contains
> a lot fixes and improvements, see announcement [1] for more details.
> 
> OK?

This needs a WANTLIB sync, they now use fontconfig/Xft. Otherwise OK
(it's worth noting in the commit log that people using -fn may want to
change their fontspec).

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2015/11/09 01:01:49

Modified files:
www/p5-HTTP-Server-Simple-PSGI: Makefile distinfo 
www/p5-HTTP-Server-Simple-PSGI/pkg: PLIST 

Log message:
Update to p5-HTTP-Server-Simple-PSGI-0.16.

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2015/11/09 01:30:02

Modified files:
security/p5-Catalyst-Plugin-Authorization-ACL: Makefile distinfo 

Log message:
Update to p5-Catalyst-Plugin-Authorization-ACL-0.16.

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2015/11/09 02:49:05

Modified files:
mail/p5-Catalyst-Plugin-Email: Makefile distinfo 

Log message:
Update to p5-Catalyst-Plugin-Email-0.09.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/09 03:36:25

Modified files:
fonts/cantarell-fonts: Makefile distinfo 

Log message:
Update to cantarell-fonts-0.0.18.1.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/09 15:36:38

Modified files:
net/icinga/core2: Makefile 
net/icinga/core2/pkg: DESCR-main 
Added files:
net/icinga/core2/patches: patch-lib_base_utility_cpp 
  patch-lib_base_utility_hpp 
  patch-lib_compat_externalcommandlistener_cpp 

Log message:
Add upstream patches for Icinga2 so that opening a fifo doesn't block
open()s in other threads, fixing an issue where the daemon doesn't start
correctly when the command listener is enabled.

Many thanks to dnsmichi and gunnarbeutner from Icinga for tracking this
down and fixing it.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2015/11/09 15:45:07

Modified files:
net/openafs: Makefile 

Log message:
With the new strict modes checking, openafs needs SUBST_CMD -m.

Re: [UPDATE] x11/dmenu

[Matthias Kilian]

Hi,

On Mon, Nov 09, 2015 at 09:42:22PM +0100, Joerg Jung wrote:
> please find below an update for x11/dmenu to 4.6. This release contains
> a lot fixes and improvements, see announcement [1] for more details.
> 
> OK?

Looks ok and works for me. ok kili@

Ciao,
Kili

UPDATE: security/stunnel

[Gleydson Soares]

here is an update to stunnel 5.26
OK?

Index: Makefile
===
RCS file: /cvs/ports/security/stunnel/Makefile,v
retrieving revision 1.78
diff -u -p -u -p -r1.78 Makefile
--- Makefile14 Oct 2015 02:05:06 -  1.78
+++ Makefile9 Nov 2015 23:15:29 -
@@ -2,7 +2,7 @@
 
 COMMENT=   SSL encryption wrapper for standard network daemons
 
-DISTNAME=  stunnel-5.24
+DISTNAME=  stunnel-5.26
 CATEGORIES=security
 
 MAINTAINER=Gleydson Soares 
Index: distinfo
===
RCS file: /cvs/ports/security/stunnel/distinfo,v
retrieving revision 1.36
diff -u -p -u -p -r1.36 distinfo
--- distinfo14 Oct 2015 02:05:06 -  1.36
+++ distinfo9 Nov 2015 23:15:29 -
@@ -1,2 +1,2 @@
-SHA256 (stunnel-5.24.tar.gz) = qy5aEDTUIpUd2tIbVy63+o77TEzgS8hlNsaEXz0CsH4=
-SIZE (stunnel-5.24.tar.gz) = 631730
+SHA256 (stunnel-5.26.tar.gz) = LJDUaQEe7Y3JTwAwE+PAVd5v22h+8ecfoAQoHX98JyY=
+SIZE (stunnel-5.26.tar.gz) = 635710
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/security/stunnel/patches/patch-Makefile_in,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-Makefile_in
--- patches/patch-Makefile_in   25 Jun 2015 14:44:30 -  1.11
+++ patches/patch-Makefile_in   9 Nov 2015 23:15:29 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Makefile_in,v 1.11 2015/06/25 14:44:30 gsoares Exp $
 Makefile.in.orig   Mon Jun  1 11:25:53 2015
-+++ Makefile.inFri Jun 12 12:44:13 2015
-@@ -355,7 +355,7 @@ top_build_prefix = @top_build_prefix@
+--- Makefile.in.orig   Mon Nov  2 13:32:06 2015
 Makefile.inMon Nov  9 18:12:39 2015
+@@ -357,7 +357,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  ACLOCAL_AMFLAGS = -I m4
Index: patches/patch-src_ctx_c
===
RCS file: patches/patch-src_ctx_c
diff -N patches/patch-src_ctx_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_ctx_c 9 Nov 2015 23:15:29 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/ctx.c.orig Mon Nov  9 18:13:44 2015
 src/ctx.c  Mon Nov  9 18:15:24 2015
+@@ -349,7 +349,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
+ / initialize OpenSSL CONF */
+ 
+ NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ SSL_CONF_CTX *cctx;
+ NAME_LIST *curr;
+ char *cmd, *param;
Index: patches/patch-src_options_c
===
RCS file: /cvs/ports/security/stunnel/patches/patch-src_options_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_options_c
--- patches/patch-src_options_c 14 Oct 2015 02:05:06 -  1.2
+++ patches/patch-src_options_c 9 Nov 2015 23:15:29 -
@@ -3,9 +3,9 @@ $OpenBSD: patch-src_options_c,v 1.2 2015
 use SSLv23_client_method() required to build with libressl since that it 
haven't
 TLS_client_method()  for now.
 
 src/options.c.orig Tue Oct  6 13:16:11 2015
-+++ src/options.c  Tue Oct  6 05:52:42 2015
-@@ -2507,7 +2507,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
+--- src/options.c.orig Tue Nov  3 07:44:03 2015
 src/options.c  Mon Nov  9 18:12:39 2015
+@@ -2539,7 +2539,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
  /* sslVersion */
  switch(cmd) {
  case CMD_BEGIN:
@@ -14,7 +14,7 @@ TLS_client_method()  for now.
  section->client_method=(SSL_METHOD *)TLS_client_method();
  section->server_method=(SSL_METHOD *)TLS_server_method();
  #else
-@@ -2519,7 +2519,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
+@@ -2551,7 +2551,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O
  if(strcasecmp(opt, "sslVersion"))
  break;
  if(!strcasecmp(arg, "all")) {

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/09 03:01:30

Modified files:
mail/evolution : Makefile distinfo 

Log message:
Update to evolution-3.18.2.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/09 03:01:10

Modified files:
databases/evolution-data-server: Makefile distinfo 

Log message:
Update to evolution-data-server-3.18.2.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/09 03:01:46

Modified files:
mail/evolution-ews: Makefile distinfo 

Log message:
Update to evolution-ews-3.18.2.

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2015/11/09 01:18:24

Modified files:
textproc/p5-Template-Timer: Makefile distinfo 

Log message:
Update to p5-Template-Timer-1.00.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2015/11/09 01:28:20

Modified files:
x11/gnome/bijiben: Makefile distinfo 
x11/gnome/bijiben/pkg: PLIST 

Log message:
update to bijiben-3.18.2

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2015/11/09 02:29:05

Added files:
www/webkit/patches: patch-Source_WTF_wtf_dtoa_utils_h 

Log message:
Fix build on sparc64.

Re: [UPDATE} mail/abook 0.6.1

[J. Scott Heppler]

In post-install used $INSTALL_DATA_DIR and $INSTALL_DATA.
Whitespaces around "=" consistent and extra lines removed.
Old diff/comments removed to make cvs patching easier.

Index: Makefile
===
RCS file: /cvs/ports/mail/abook/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile29 Jun 2015 15:39:43 -  1.31
+++ Makefile10 Nov 2015 00:42:32 -
@@ -1,33 +1,36 @@
# $OpenBSD: Makefile,v 1.31 2015/06/29 15:39:43 sthen Exp $

-COMMENT=   addressbook program with mutt support
+COMMENT=   addressbook program with mutt support

-DISTNAME=  abook-0.5.6
-REVISION=  2
-CATEGORIES=mail
+V= 0.6.1
+DISTNAME=  abook-$V
+CATEGORIES=mail

-HOMEPAGE=  http://abook.sourceforge.net/
+HOMEPAGE=  http://abook.sourceforge.net/

# GPLv2
PERMIT_PACKAGE_CDROM=  Yes

-WANTLIB += c ncursesw readline
+WANTLIB+=  c ncursesw readline

-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=abook/}
+MASTER_SITES=  http://abook.sourceforge.net/devel/

-MODULES=   devel/gettext
+MODULES=   devel/gettext \
+   converters/libiconv

-CONFIGURE_STYLE=gnu
+CONFIGURE_STYLE=   gnu
+AUTOCONF_VERSION=  2.69
+AUTOMAKE_VERSION=  1.14

-EXAMPLESDIR=   ${PREFIX}/share/examples/abook
-WHITELIST=README abook2whitelist.sh mutt.whitelist whitelist.rc
+pre-configure:
+   @cd ${WRKSRC}; env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+   AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoreconf -i

post-install:
-   ${INSTALL_DATA_DIR} ${EXAMPLESDIR}/whitelist
-   ${INSTALL_DATA} ${WRKSRC}/contrib/mail2abook.py ${EXAMPLESDIR}
-   ${INSTALL_DATA} ${WRKSRC}/contrib/vcard2abook.pl ${EXAMPLESDIR}
-   cd ${WRKSRC}/contrib/whitelist && \
-   ${INSTALL_DATA} ${WHITELIST} ${EXAMPLESDIR}/whitelist
-   ${INSTALL_DATA} ${WRKSRC}/sample.abookrc ${EXAMPLESDIR}
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/abook/
+   ${INSTALL_DATA} ${WRKSRC}/sample.abookrc \
+   ${PREFIX}/share/examples/abook
+

.include 
+
Index: distinfo
===
RCS file: /cvs/ports/mail/abook/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo18 Jan 2015 03:14:20 -  1.11
+++ distinfo10 Nov 2015 00:42:32 -
@@ -1,2 +1,2 @@
-SHA256 (abook-0.5.6.tar.gz) = Bkb2MRqUrTNBgSpN4SpalAp6RNXLbp2lsJMKrp9EdW4=
-SIZE (abook-0.5.6.tar.gz) = 393097
+SHA256 (abook-0.6.1.tar.gz) = 8KkN+GlPs0aF7N1F2X2yi4gEbBXJXnsHAFlgKL2LwPk=
+SIZE (abook-0.6.1.tar.gz) = 319558
Index: pkg/DESCR
===
RCS file: /cvs/ports/mail/abook/pkg/DESCR,v
retrieving revision 1.4
diff -u -p -r1.4 DESCR
--- pkg/DESCR   22 Sep 2010 08:59:07 -  1.4
+++ pkg/DESCR   10 Nov 2015 00:42:32 -
@@ -1,10 +1,7 @@
Addressbook program with mutt mail client support.

-abook uses curses libs and is able to import addressbooks from
-pine and netscape (ldif).
-Exports to mutt alias, html, pine, gcrd (GnomeCard), csv, elm 
-alias, and plain text.

+abook uses curses libs and is able to import and export from other addressbook
+formats.

-It is nice for querying from within mutt; to use it as such, add
-the following to your muttrc:
-set query_command="${PREFIX}/bin/abook --mutt-query '%s'"
+It is nice for querying from within mutt; to use it as such, add the following
+to your muttrc: set query_command="${PREFIX}/bin/abook --mutt-query '%s'".
Index: pkg/PLIST
===
RCS file: /cvs/ports/mail/abook/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST   29 Jun 2015 15:39:43 -  1.10
+++ pkg/PLIST   10 Nov 2015 00:42:32 -
@@ -1,17 +1,21 @@
-@comment $OpenBSD: PLIST,v 1.10 2015/06/29 15:39:43 sthen Exp $
+@comment $OpenBSD$
@bin bin/abook
@man man/man1/abook.1
@man man/man5/abookrc.5
share/examples/abook/
-share/examples/abook/mail2abook.py
share/examples/abook/sample.abookrc
-share/examples/abook/vcard2abook.pl
-share/examples/abook/whitelist/
-share/examples/abook/whitelist/README
-share/examples/abook/whitelist/abook2whitelist.sh
-share/examples/abook/whitelist/mutt.whitelist
-share/examples/abook/whitelist/whitelist.rc
share/locale/de/LC_MESSAGES/abook.mo
+share/locale/de/LC_TIME/
+share/locale/de/LC_TIME/abook.mo
share/locale/fr/LC_MESSAGES/abook.mo
+share/locale/fr/LC_TIME/
+share/locale/fr/LC_TIME/abook.mo
+share/locale/it/LC_MESSAGES/abook.mo
+share/locale/it/LC_TIME/
+share/locale/it/LC_TIME/abook.mo
share/locale/ja/LC_MESSAGES/abook.mo
+share/locale/ja/LC_TIME/
+share/locale/ja/LC_TIME/abook.mo
share/locale/sv/LC_MESSAGES/abook.mo
+share/locale/sv/LC_TIME/
+share/locale/sv/LC_TIME/abook.mo