Re: Building ports as a regular user fails with PLIST_DB & other permission errors

2016-03-21 Thread Raf Czlonka
On Tue, Mar 22, 2016 at 12:19:37AM GMT, Karl O. Pinc wrote:
> Hi Raf,
> 
> Thanks for the reply.
> 
> On Tue, 22 Mar 2016 00:02:58 +
> Raf Czlonka  wrote:
> 
> > On Mon, Mar 21, 2016 at 03:03:15PM GMT, Karl O. Pinc wrote:
> 
> > > OpenBSD 5.8-stable.
> > > 
> > > I tried following the instructions in ports(7)
> > > and the FAQ to build ports as an ordinary user.
> > > I added to /etc/mk.conf:
> > > 
> > > WRKOBJDIR=/usr/obj/ports
> > > DISTDIR=/usr/distfiles
> > > PACKAGE_REPOSITORY=/usr/packages  
> > 
> > If you leave the defaults and don't explicitly set any of the above,
> > all the relevant directories will be under /usr/ports, which can
> > make your life easier (see below):
> > 
> > PORTSDIR=/usr/ports
> > DISTDIR=${PORTSDIR}/distfiles
> > WRKOBJDIR=${PORTSDIR}/pobj
> > PACKAGE_REPOSITORY=${PORTSDIR}/packages
> 
> But if I do this I have to make /usr/ports writable by my
> user.   Or parts thereof.  See below.
> 
> > > I then tried to build a port with:
> > > 
> > > make package LOCKDIR= BULK=Yes
> > > 
> > > I got permission errors writing the package list
> > > since my user does not have permissions to write
> > > in /usr/ports/.  Apologies, I did not copy the
> > > exact error.  
> > 
> > This is not a bug - the FAQ clearly states[0] what you need to do.
> 
> I followed the FAQ where it says:
> 
>  It is possible to use a read-only ports tree by separating directories
>  that are written to during port building:
> 
> The working directory of ports. This is controlled by the WRKOBJDIR
> variable, which specifies the directory which will contain the
> working directories. The directory containing distribution files.
> This is controlled by the DISTDIR variable. The directory
> containing newly built binary packages. This is controlled by the
> PACKAGE_REPOSITORY variable. 
> 
>  For example, you could add the following lines to /etc/mk.conf:
> 
> WRKOBJDIR=/usr/obj/ports
> DISTDIR=/usr/distfiles
> PACKAGE_REPOSITORY=/usr/packages
> 
>  If desired, you can also change the ownership of these directories to
>  your local username and group, so that the ports system can create the
>  underlying working directories as a regular user.
> 
> But the above is wrong, since setting PACKAGE_REPOSITORY is not
> enough. If you follow the above you must be root (unless
> frobbing the ownership of /usr/ports).  In any case /usr/ports
> is written to, although not the subdirectories that come in the
> ports tarball.
> 
> Of course it may not be possible to both build ports as an ordinary
> user and have a read-only /usr/ports/ -- but this is not clear
> from the FAQ.   Hence my email.
> 
> Regards,
> 
> Karl 
> Free Software:  "You don't pay back, you pay forward."
>  -- Robert A. Heinlein

You have included a link which seems you have missed. Read it, please.

Aslo, moving this to ports@

Raf



Re: NEW: games/quakespasm 0.91.0 (was: Re: Ports not linked into the build)

2016-03-21 Thread Brandon Mercer
On Mon, Mar 21, 2016 at 04:26:08PM +0100, Adam Wolk wrote:
> On Tue, 22 Mar 2016 01:23:32 +1100
> Jonathan Gray  wrote:
> 
> > On Mon, Mar 21, 2016 at 09:32:30AM -0400, Brandon Mercer wrote:
> > > On Mon, Mar 21, 2016 at 10:29:32AM +0300, Kirill Bychkov wrote:  
> > > > On Mon, March 21, 2016 00:38, Christian Weisgerber wrote:  
> > > > > There are a number of ports that aren't linked to the build.
> > > > > I can't quite tell for which this is intentional and where it
> > > > > was simply forgotten:
> > > > >
> > > > > devel/rcs-fast-import
> > > > > games/quake2
> > > > > lang/compcert
> > > > > lang/php/7.0
> > > > > net/py-pcs
> > > > > sysutils/autossh
> > > > > www/mozilla-sync/*
> > > > > x11/kde4/kalzium
> > > > >
> > > > > Also a number of firefox and kde4 language files, but I assume
> > > > > those are intentional.
> > > > >  
> > > > Looks like autossh was replaced by mistake:  
> > > 
> > > The quake2 port has been removed. It wasn't working for about 2
> > > years and has recently been replaced anyhow. Thanks Adam!
> > >   
> > 
> > On a related note here is quakespasm 0.91.0 to replace games/quake.
> 
> Tested on amd64 snap mar 18th - the game works great, finished a full
> level on full screen. Instructions were all clear (had to rename files
> to lowercase). Not sure if it's an OK place to have a post installation
> instructions in the package description instead of a pkg-readme but
> it's not that long.
> 
> Generally OK awolk@ please get it to the tree and let's kill the old
> quake port. I assume the same quirk as quake2 -> yquake2 will be
> required for this port.

OK from me as well. I have tested the version that preceeded this as
well. 



CVS: cvs.openbsd.org: ports

2016-03-21 Thread Aaron Bieber
CVSROOT:/cvs
Module name:ports
Changes by: abie...@cvs.openbsd.org 2016/03/21 17:30:08

Modified files:
news/sabnzbd   : Makefile distinfo 
news/sabnzbd/pkg: PLIST 

Log message:
Update to 1.0.0 of SABNzbd+ from Carlin Bingham 

Tested on amd64. This update has many changes, and upgrading with items
in the queue is not supported. For more info see:
http://wiki.sabnzbd.org/introducing-1-0-0

If you do upgrade with a full queue, you will need to run: "queue repair"
to resolve any issues.

OK sthen@



Re: [New port] SLOCCount 2.26

2016-03-21 Thread Stuart Henderson
On 2016/03/21 20:35, Gregor Best wrote:
> Hi people,
> 
> attached is a new port for SLOCCount [0].  I use it from time to time to
> get an overview over unfamiliar code bases. From the homepage:
> 
>[SLOCCount is] a  set of tools for counting physical  Source Lines of
>Code (SLOC) in a large number of languages of a potentially large set
>of programs.
> 
> It can (heuristically) determine a lot of different languages, though a
> few modern languages like Rust and Go are missing. It's sufficient for
> older or more traditional code bases though.
> 
> I've put the port in the "devel" category because "textproc" felt a bit
> wrong.
> 
> [0]: http://www.dwheeler.com/sloccount/
> 
> -- 
>   Gregor

quick comments,

- DESCR is a bit long
- manpages shouldn't be compressed
- textproc probably is better, then it will be in the same
category as cloc. devel as a secondary category makes sense though.
- optional but you could avoid patching the makefile like this
 
MAKE_FLAGS= PREFIX=${PREFIX} \
MAN_DIR=${PREFIX}/man \
DOC_DIR=${PREFIX}/share/doc/sloccount

(also tar.gz is a bit easier than .tbz to review for those of us
who have their mail client to pass mimetypes like application/x-tar,
x-tar-gz, etc to vim ;)



Update man pages after NO_SHARED cleanup

2016-03-21 Thread Christian Weisgerber
The scaffolding to support architectures without shared libraries
has been removed from the ports infrastructure.  This updates the
ports tree man pages accordingly.

  bsd.port.arch.mk.5
  bsd.port.mk.5
  port-modules.5
  ruby-module.5

Gone are or will be shortly:
* the variables CONFIGURE_SHARED, NO_SHARED_LIBS, NO_SHARED_ARCHS,
  and SHARED_ONLY;
* the PROPERTIES value "no_shared";
* the PFRAG.shared* and PFRAG.no-shared* files.

(While there, also drop mention of the long gone PROPERTIES value
"elf".)

OK?

Index: bsd.port.arch.mk.5
===
RCS file: /cvs/src/share/man/man5/bsd.port.arch.mk.5,v
retrieving revision 1.8
diff -u -p -r1.8 bsd.port.arch.mk.5
--- bsd.port.arch.mk.5  10 Aug 2013 10:17:36 -  1.8
+++ bsd.port.arch.mk.5  21 Mar 2016 22:02:36 -
@@ -72,7 +72,6 @@ assumes the following variables are alre
 .El
 and optionally, if the default won't be appropriate
 .Bl -tag -offset indent -compact -width ONLY_FOR_ARCH-
-.It Ev NO_SHARED_LIBS
 .It Ev IGNORE[-]
 .El
 .Pp
@@ -88,8 +87,6 @@ It will set up the following variables f
 .It Ev GCC4_ARCHS
 .It Ev LE_ARCHS
 .It Ev LP64_ARCHS
-.It Ev NO_SHARED_ARCHS
-.It Ev NO_SHARED_LIBS
 .It Ev PROPERTIES
 .It Ev IGNORE-
 .It Ev BUILD_PACKAGES
@@ -133,19 +130,13 @@ A more detailed description of each vari
 .Pp
 All the constant values
 .Ev ARCH , ALL_ARCHS , COMPILER_VERION ,
-.Ev GCC3_ARCHS , GCC4_ARCHS , LP64_ARCHS , NO_SHARED_ARCHS
+.Ev GCC3_ARCHS , GCC4_ARCHS , LP64_ARCHS
 and
 .Ev PROPERTIES
 are also available from
 .Ev MODULES
 and from
 .Pa ${.CURDIR}/../Makefile.inc .
-Note that due to historical accident,
-.Ev NO_SHARED_LIBS
-is not such a constant.
-Test
-.Ev PROPERTIES
-to assert whether a given platform supports shared libraries.
 .Sh SEE ALSO
 .Xr bsd.port.mk 5
 .Sh HISTORY
Index: bsd.port.mk.5
===
RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.433
diff -u -p -r1.433 bsd.port.mk.5
--- bsd.port.mk.5   11 Mar 2016 20:40:23 -  1.433
+++ bsd.port.mk.5   21 Mar 2016 22:02:37 -
@@ -834,20 +834,14 @@ as well.
 Update the packing lists for a port, using the fake installation and the
 existing packing lists.
 .Cm update-plist
-should produce mostly correct
-.Pa PLIST ,
-.Pa PFRAG.shared
-and
-.Pa PFRAG.no-shared
-files, handling shared libraries, GNU
+should produce a mostly correct
+.Pa PLIST
+file, handling GNU
 .Xr info 1
 files, setuid files, and empty directories.
-It moves existing files to
-.Pa PLIST.orig ,
-.Pa PFRAG.shared.orig
-and
-.Pa PFRAG.no-shared.orig .
-If the generated lists include files and directories that shouldn't be
+It moves an existing file to
+.Pa PLIST.orig .
+If the generated list includes files and directories that shouldn't be
 included, comment these like this:
 .Bd -literal
 @comment unwanted-file
@@ -1311,11 +1305,6 @@ Set to name of script invoked by the
 .Cm configure
 target, if appropriate.
 Should be either an absolute path, or relative to ${WRKSRC}.
-.It Ev CONFIGURE_SHARED
-Set by default to --enable-shared or --disable-shared, depending on whether
-the architecture supports shared libraries.
-Should be appended to CONFIGURE_ARGS, for ports that build dynamic libraries
-and whose configure script supports these options.
 .It Ev CONFIGURE_STYLE
 Set to style of configuration that needs to happen.
 .Pp
@@ -2035,11 +2024,6 @@ ${PACKAGE_REPOSITORY}/${NO_ARCH}.
 List of architectures on which this port does not build.
 See also
 .Ev ONLY_FOR_ARCHS .
-See also
-.Ev SHARED_ONLY .
-Do not use instead of
-.Ev SHARED_ONLY
-without very good reasons.
 .It Ev NO_BUILD
 Set to
 .Sq Yes
@@ -2090,20 +2074,6 @@ It should be left alone for ports with e
 ports with failing tests.
 That way, if a subsequent update of a port acquires actual regression tests,
 they will be picked up automatically.
-.It Ev NO_SHARED_ARCHS
-Set to the list of platforms that do not support shared libraries.
-Read-only.
-Use with
-.Ev NOT_FOR_ARCHS .
-.It Ev NO_SHARED_LIBS
-Set to
-.Sq Yes
-if platform does not support shared libraries.
-To be tested after including
-.Nm ,
-or
-.Xr bsd.port.arch.mk 5 ,
-if neither PFRAG.shared nor CONFIGURE_SHARED are enough.
 .It Ev NO_SYSTRACE
 Port does not build with systrace-enabled build targets.
 .It Ev OLD_WRKDIR_NAME
@@ -2493,22 +2463,17 @@ and
 .Ev BUILD_PACKAGES
 is generally preferred (and simpler).
 Possible properties include
-.Bl -tag -width no_shared
+.Bl -tag -width mono
 .It apm
 architecture possesses suspend (apm) support.
 .It be
 architecture is big-endian.
 .It gccN
 gccN architecture.
-.It elf
-.Xr elf 5
-architecture.
 .It le
 architecture is little-endian.
 .It lp64
 lp64 architecture.
-.It no_shared
-architecture has no shared library support.
 .It llvm
 there is
 .Pa lang/llvm
@@ -2667,10 +2632,6 @@ Porters of software using libtool should
 .Ev MAKE_FLAGS
 get propagated to the libtool invocations.
 This should be 

CVS: cvs.openbsd.org: ports

2016-03-21 Thread Jeremie Courreges-Anglas
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/03/21 14:07:16

Modified files:
devel/doxygen  : Makefile 

Log message:
Missing build dep on python, spotted by naddy@



[New port] SLOCCount 2.26

2016-03-21 Thread Gregor Best
Hi people,

attached is a new port for SLOCCount [0].  I use it from time to time to
get an overview over unfamiliar code bases. From the homepage:

   [SLOCCount is] a  set of tools for counting physical  Source Lines of
   Code (SLOC) in a large number of languages of a potentially large set
   of programs.

It can (heuristically) determine a lot of different languages, though a
few modern languages like Rust and Go are missing. It's sufficient for
older or more traditional code bases though.

I've put the port in the "devel" category because "textproc" felt a bit
wrong.

[0]: http://www.dwheeler.com/sloccount/

-- 
Gregor


devel-sloccount.tbz
Description: Binary data


Re: [NEW] www/pnp4nagios

2016-03-21 Thread Kirill Bychkov
On Mon, March 21, 2016 11:53, Vadim Zhukov wrote:
> 2016-03-20 10:35 GMT+03:00 Kirill Bychkov :
>> On Fri, March 11, 2016 12:16, Kirill Bychkov wrote:
>>> On Thu, March 10, 2016 23:22, Vadim Zhukov wrote:
 2016-03-09 17:08 GMT+03:00 Kirill Bychkov :
> On Thu, March 3, 2016 16:57, Kirill Bychkov wrote:
>> Him guys!
>> This is a port of PNP4Nagios, an addon for Nafios and Oconga for
>> analyzing
>> performance data and storing it in RRD.
>> Current port is partially based on an old one from henning@ [1] and
>> tested
>> for more than a month with Icinga 1.x processing data from about 400
>> hosts.
>> It could be splitted to Nagios and Icinga 2.x flavors if there are some
>> interest in them and one can test it with.
>>
>> [1] http://marc.info/?l=openbsd-ports=140803165912579=2
>>
>> Comments? OKs?
> Objections? :)
>>
>> ping
>>
>
>[...]

> Now it looks like more or less fine. I don't understand why ${VARBASE}
> and ${LOCALSTATEDIR} are used in, say, PREFIX-www, but not in
> CONFIGURE_ARGS.
>

Changed hardcoded paths to make Makefile look consistent (and please portcheck).

Index: Makefile
===
RCS file: /cvs/ports/www/pnp4nagios/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile21 Mar 2016 09:57:27 -  1.9
+++ Makefile21 Mar 2016 19:31:52 -
@@ -37,11 +37,11 @@ LOCALSTATEDIR = ${BASELOCALSTATEDIR}/pn

 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS +=  --with-nagios-user=_icinga --with-nagios-group=_icinga \
-   --datarootdir=/var/www/pnp4nagios/ \
+   --datarootdir=${VARBASE}/www/pnp4nagios/ \
--libexecdir=${PREFIX}/libexec/nagios \
-   --with-perfdata-dir=/var/www/pnp4nagios/rrd \
-   --with-perfdata-spool-dir=/var/spool/icinga \
-  
--with-perfdata-logfile=/var/log/pnp4nagios/pnp4nagios.log
+   --with-perfdata-dir=${VARBASE}/www/pnp4nagios/rrd \
+   --with-perfdata-spool-dir=${VARBASE}/spool/icinga \
+  
--with-perfdata-logfile=${VARBASE}/log/pnp4nagios/pnp4nagios.log

 MULTI_PACKAGES =   -main -cgi
 PREFIX-cgi =   ${VARBASE}/www
@@ -51,6 +51,8 @@ NO_TEST = Yes
 PKG_ARCH-cgi = *

 INSTALL_TARGET =   install install-config
+
+SUBST_VARS +=  VARBASE

 # fix broken symlink in tarbal
 post-extract:
cvs server: Diffing patches
cvs server: Diffing pkg
Index: pkg/README-cgi
===
RCS file: /cvs/ports/www/pnp4nagios/pkg/README-cgi,v
retrieving revision 1.3
diff -u -p -r1.3 README-cgi
--- pkg/README-cgi  21 Mar 2016 09:57:27 -  1.3
+++ pkg/README-cgi  21 Mar 2016 19:31:52 -
@@ -7,10 +7,10 @@ $OpenBSD: README.template,v 1.4 2011/06/
 Apache2
 ---
 Apache2 configuration for PNP4Nagios is stored under:
-/var/www/conf/modules.sample/pnp4nagios.conf
+${VARBASE}/www/conf/modules.sample/pnp4nagios.conf

 It needs to be enabled by running the following command:
-# ln -s ../modules.sample/pnp4nagios.conf /var/www/conf/modules
+# ln -s ../modules.sample/pnp4nagios.conf ${VARBASE}/www/conf/modules
 # rcctl restart apache2


@@ -18,6 +18,6 @@ Icinga-web
 --
 To integrate PNP4Nagios into the Icinga Web frontend you will need to
 install templates extensions which comes with icinga-web package:
-% cd /var/www/icinga-web/app/modules/Cronks/data/xml/extensions
+% cd ${VARBASE}/www/icinga-web/app/modules/Cronks/data/xml/extensions
 # ln -s pnp-host-extension.xml.dist pnp-host-extension.xml
 # ln -s pnp-service-extension.xml.dist pnp-service-extension.xml

>   WBR,
>   Vadim Zhukov
>


pnp4nagios.tar.gz
Description: application/gzip


Re: Where do we want PKG_ARCH in Makefile?

2016-03-21 Thread Nigel Taylor
On 03/20/16 10:33, Stuart Henderson wrote:
> Watch out for p5-libintl, it currently does not have SHARED_ONLY=Yes
> and should do. Not touching it myself now to avoid getting in your way.
> 
> 

These also are wrong, and have been for some time.

$ pwd
/usr/ports/packages/amd64/no-arch
$ pkg_info -Sq p5-* | grep ",[A-z]"
p5-Digest-MD4-1.9p1,c.84.2
p5-Digest-Skein-0.05p3,c.84.2
p5-Socket-GetAddrInfo-0.22p0,c.84.2
p5-Wx-0.9928,@p5-Alien-wxWidgets-0.67p0,@p5-ExtUtils-XSpp-0.18,@wxWidgets-media-2.8.12p7,m.9.0,pthread.20.1,stdc++.57.0,wx_base.3.0,wx_base_net.3.0,wx_base_xml.3.0,wx_gtk2_adv.3.0,wx_gtk2_aui.3.0,wx_gtk2_core.3.0,wx_gtk2_html.3.0,wx_gtk2_media.3.0,wx_gtk2_richtext.3.0,wx_gtk2_stc.3.0,wx_gtk2_xrc.3.0


The p5-Digest-MD4 has MD4.xs

so needs a WANTLIB += perl
It's has a #include perl.h in MD4.xs

p5-Digest-Skein has skein.xs

p5-Socket-GetAddrInfo has lib/Socket/GetAddrInfo.xs

p5-Wx has .xs files everywhere



All these are wrong also .

$ pkg_info -Sq *.tgz | grep ",[A-z]"
glm-0.9.7.1,@gcc-libs-4.9.3p3,estdc++.17.0
gnustep-make-2.6.7p1,@gcc-libs-4.9.3p3,@gtar-1.28p1,estdc++.17.0
gtk3mm-documentation-3.18.0,@gcc-libs-4.9.3p3,estdc++.17.0
kde-shared-data-4.14.3p1,@gcc-libs-4.9.3p3,@gtk-update-icon-cache-3.18.9,estdc++.17.0
ruby-ri_docs-1.8.7.374p0,@libiconv-1.14p3,iconv.6.0
tmake-1.10p3,@qt3-mt-3.8p9,lib/qt3/qt-mt.33.0
unoconv-0.7p1,@gcc-libs-4.9.3p3,@libreoffice-5.1.1.3p0v0,@python-3.4.4,estdc++.17.0


$ make SUBDIR="`cat /tmp/l.9|xargs`" show="WANTLIB PKG_ARCH"
===> converters/unoconv
estdc++>=17
*
===> devel/tmake
lib/qt3/qt-mt>=3
*
===> graphics/glm
estdc++>=17
*
===> lang/ruby/1.8,-ri_docs
iconv>=2
amd64
===> misc/gtk3mm-documentation
estdc++>=17
*
===> x11/gnustep/make
estdc++>=17
*
===> x11/kde-shared-data
 estdc++>=17
*

$ make show="WANTLIB-ri_docs PKG_ARCH-ri_docs"
iconv>=2
*



shouldn't use PKG_ARCH=* and WANTLIB. one of the two is wrong. Looks
like portcheck agrees

$ cd x11/gnustep/make/
$ portcheck
non-empty WANTLIB for arch-independent package
x11/gnustep/make

$ portcheck
non-empty WANTLIB for arch-independent package
security/p5-Digest-MD4



$ portcheck
www/p5-HTML-Base

portcheck fails to find this one... It could find problem by analysing
the PLIST

PKG_ARCH = * means the expanded PLIST shouldn't contain `machine`, in
file paths they should all be machine independent locations, this case
${P5ARCH} is expanded and contains machine.

I do have a fixed version of p5-HTML-Base. Replace ${P5ARCH} by
${P5SITE} in the do-install:, recreate pkg/PLIST, and bump.

Unexpanded PLIST files could look for ${(|P5|MACHINE-)ARCH}
But don't want NO_ARCH.



Should portgen be updated?

Perl ports should have normally a PKG_ARCH = * added to the Makefile.
When perl uses C or other languages PKG_ARCH = * should not be present,
a WANTLIB += perl should.

To find which either read MANIFEST if files listed end in .xs excluding
those under t/ xt/ inc/ or search for files using find

$ find `make show=WRKSRC`/!(inc|t|xt) -name "*.xs"
/usr/ports/pobj/p5-Cpanel-JSON-XS-3.0213/Cpanel-JSON-XS-3.0213/XS.xs

So this port should not have PKG_ARCH = *
needs a WANTLIB += perl in the Makefile, as a .xs file is present.






Re: update: textproc/p5-XML-RSS-LibXML

2016-03-21 Thread Okan Demirmen
On Mon 2016.03.21 at 19:47 +0100, Daniel Jakots wrote:
> On Mon, 21 Mar 2016 14:30:49 -0400, Okan Demirmen 
> wrote:
> 
> > Index: Makefile
> > ===
> > RCS file: /home/open/cvs/ports/textproc/p5-XML-RSS-LibXML/Makefile,v
> > retrieving revision 1.10
> > diff -u -p -r1.10 Makefile
> > --- Makefile20 Mar 2016 19:57:11 -  1.10
> > +++ Makefile21 Mar 2016 15:36:22 -
> > @@ -4,9 +4,11 @@ COMMENT=   XML::RSS with XML::LibXML
> >  
> >  MODULES=   cpan
> >  PKG_ARCH=  *
> > -DISTNAME=  XML-RSS-LibXML-0.3002
> > +DISTNAME=  XML-RSS-LibXML-0.3105
> >  REVISION=  1
> 
> You forgot to remove the REVISION.

Gah - thanks!

Index: Makefile
===
RCS file: /home/open/cvs/ports/textproc/p5-XML-RSS-LibXML/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile20 Mar 2016 19:57:11 -  1.10
+++ Makefile21 Mar 2016 19:01:02 -
@@ -4,9 +4,10 @@ COMMENT=   XML::RSS with XML::LibXML
 
 MODULES=   cpan
 PKG_ARCH=  *
-DISTNAME=  XML-RSS-LibXML-0.3002
-REVISION=  1
+DISTNAME=  XML-RSS-LibXML-0.3105
 CATEGORIES=textproc
+
+CONFIGURE_STYLE=modbuild
 
 # Perl
 PERMIT_PACKAGE_CDROM=  Yes
Index: distinfo
===
RCS file: /home/open/cvs/ports/textproc/p5-XML-RSS-LibXML/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo18 Jan 2015 03:15:28 -  1.3
+++ distinfo21 Mar 2016 15:35:39 -
@@ -1,2 +1,2 @@
-SHA256 (XML-RSS-LibXML-0.3002.tar.gz) = 
GanWkeHtEZwjAbWMIp0i8kwzEkg+I8Mh6Ob1segzX2k=
-SIZE (XML-RSS-LibXML-0.3002.tar.gz) = 88719
+SHA256 (XML-RSS-LibXML-0.3105.tar.gz) = 
+ReWPRqarN9jrr1N4eFvOPQ1LNjpVqq3Rl6ne+jWtns=
+SIZE (XML-RSS-LibXML-0.3105.tar.gz) = 81621
Index: pkg/PLIST
===
RCS file: /home/open/cvs/ports/textproc/p5-XML-RSS-LibXML/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   6 Oct 2007 15:27:28 -   1.1.1.1
+++ pkg/PLIST   21 Mar 2016 15:37:11 -
@@ -8,6 +8,7 @@ ${P5SITE}/XML/RSS/LibXML/Namespaces.pm
 ${P5SITE}/XML/RSS/LibXML/Null.pm
 ${P5SITE}/XML/RSS/LibXML/V0_9.pm
 ${P5SITE}/XML/RSS/LibXML/V0_91.pm
+${P5SITE}/XML/RSS/LibXML/V0_92.pm
 ${P5SITE}/XML/RSS/LibXML/V1_0.pm
 ${P5SITE}/XML/RSS/LibXML/V2_0.pm
 @man man/man3p/XML::RSS::LibXML.3p



Re: update: textproc/p5-XML-RSS-LibXML

2016-03-21 Thread Daniel Jakots
On Mon, 21 Mar 2016 14:30:49 -0400, Okan Demirmen 
wrote:

> Index: Makefile
> ===
> RCS file: /home/open/cvs/ports/textproc/p5-XML-RSS-LibXML/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile  20 Mar 2016 19:57:11 -  1.10
> +++ Makefile  21 Mar 2016 15:36:22 -
> @@ -4,9 +4,11 @@ COMMENT= XML::RSS with XML::LibXML
>  
>  MODULES= cpan
>  PKG_ARCH=*
> -DISTNAME=XML-RSS-LibXML-0.3002
> +DISTNAME=XML-RSS-LibXML-0.3105
>  REVISION=1

You forgot to remove the REVISION.



update: textproc/p5-XML-Smart

2016-03-21 Thread Okan Demirmen
Update to 1.79.

OK?

Thanks,
Okan

Index: Makefile
===
RCS file: /home/open/cvs/ports/textproc/p5-XML-Smart/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile20 Mar 2016 19:57:12 -  1.12
+++ Makefile21 Mar 2016 18:37:42 -
@@ -4,7 +4,8 @@ COMMENT=access/create XML files/datas e
 
 MODULES=   cpan
 PKG_ARCH=  *
-DISTNAME=  XML-Smart-1.76
+DISTNAME=  XML-Smart-1.79
+CPAN_AUTHOR=   TMHARISH
 CATEGORIES=textproc
 
 MAINTAINER=Okan Demirmen 
@@ -12,8 +13,10 @@ MAINTAINER=  Okan Demirmen 

update: www/p5-XML-Feed

2016-03-21 Thread Okan Demirmen
Update to 0.53; depends on update to p5-XML-RSS-LibXML just posted.

I don't have a portroach environment setup - a quick test with that
would be greatly appreciated!

OK?

Thanks,
Okan

Index: Makefile
===
RCS file: /home/open/cvs/ports/www/p5-XML-Feed/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile20 Mar 2016 19:57:23 -  1.8
+++ Makefile21 Mar 2016 15:37:25 -
@@ -5,8 +5,7 @@ COMMENT=interface to RSS and Atom feed
 MODULES=   cpan
 PKG_ARCH=  *
 
-DISTNAME=  XML-Feed-0.12
-REVISION=  0
+DISTNAME=  XML-Feed-0.53
 CATEGORIES=www textproc
 CONFIGURE_STYLE=modbuild
 
@@ -18,11 +17,15 @@ BUILD_DEPENDS=  www/p5-HTML-Parser \
 
 RUN_DEPENDS=   devel/p5-Class-ErrorHandler \
textproc/p5-XML-RSS \
+   textproc/p5-XML-RSS-LibXML \
devel/p5-DateTime \
devel/p5-DateTime-Format-Mail \
devel/p5-DateTime-Format-W3CDTF \
+   devel/p5-Module-Pluggable \
www/p5-URI-Fetch \
www/p5-Feed-Find \
www/p5-XML-Atom
+
+MAKE_ENV+= TEST_POD=1
 
 .include 
Index: distinfo
===
RCS file: /home/open/cvs/ports/www/p5-XML-Feed/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo18 Jan 2015 03:15:47 -  1.2
+++ distinfo21 Mar 2016 15:26:08 -
@@ -1,2 +1,2 @@
-SHA256 (XML-Feed-0.12.tar.gz) = ti1MXXUA8m+6qhrLnseoYIq2X1jSpIFn+Z8ncRBdKVI=
-SIZE (XML-Feed-0.12.tar.gz) = 39125
+SHA256 (XML-Feed-0.53.tar.gz) = 7OA5bbZmdY8RBJCN62e24pqnJrAjJ0IvxxNNbl4xYR0=
+SIZE (XML-Feed-0.53.tar.gz) = 54588
Index: patches/patch-Makefile_PL
===
RCS file: patches/patch-Makefile_PL
diff -N patches/patch-Makefile_PL
--- patches/patch-Makefile_PL   18 Apr 2007 00:16:58 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,19 +0,0 @@
-$OpenBSD: patch-Makefile_PL,v 1.1.1.1 2007/04/18 00:16:58 espie Exp $
 Makefile.PL.orig   Wed Apr 18 02:14:47 2007
-+++ Makefile.PLWed Apr 18 02:14:56 2007
-@@ -12,6 +12,7 @@ sign(1);
- 
- include('ExtUtils::AutoInstall');
- 
-+=pod
- requires('Class::ErrorHandler');
- requires('Feed::Find');
- requires('URI::Fetch');
-@@ -21,6 +22,7 @@ requires('DateTime');
- requires('DateTime::Format::Mail');
- requires('DateTime::Format::W3CDTF');
- requires('List::Util');
-+=cut
- build_requires('LWP');
- build_requires('HTML::TokeParser');
- build_requires('Test::More');
Index: pkg/PLIST
===
RCS file: /home/open/cvs/ports/www/p5-XML-Feed/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   18 Apr 2007 00:16:58 -  1.1.1.1
+++ pkg/PLIST   26 Mar 2015 16:06:24 -
@@ -1,10 +1,17 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2007/04/18 00:16:58 espie Exp $
 ${P5SITE}/XML/Feed/
 ${P5SITE}/XML/Feed.pm
-${P5SITE}/XML/Feed/Atom.pm
 ${P5SITE}/XML/Feed/Content.pm
+${P5SITE}/XML/Feed/Enclosure.pm
+${P5SITE}/XML/Feed/Entry/
 ${P5SITE}/XML/Feed/Entry.pm
-${P5SITE}/XML/Feed/RSS.pm
+${P5SITE}/XML/Feed/Entry/Format/
+${P5SITE}/XML/Feed/Entry/Format/Atom.pm
+${P5SITE}/XML/Feed/Entry/Format/RSS.pm
+${P5SITE}/XML/Feed/Format/
+${P5SITE}/XML/Feed/Format/Atom.pm
+${P5SITE}/XML/Feed/Format/RSS.pm
 @man man/man3p/XML::Feed.3p
 @man man/man3p/XML::Feed::Content.3p
+@man man/man3p/XML::Feed::Enclosure.3p
 @man man/man3p/XML::Feed::Entry.3p



update: textproc/p5-XML-RSS-LibXML

2016-03-21 Thread Okan Demirmen
Update to 0.3105, a version that works with modern perl.

The one port (www/p5-Plagger) that depends on this lost its maintainer
and has other issues, thus I see no reason to hold this up.

OK?

Thanks,
Okan

Index: Makefile
===
RCS file: /home/open/cvs/ports/textproc/p5-XML-RSS-LibXML/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile20 Mar 2016 19:57:11 -  1.10
+++ Makefile21 Mar 2016 15:36:22 -
@@ -4,9 +4,11 @@ COMMENT=   XML::RSS with XML::LibXML
 
 MODULES=   cpan
 PKG_ARCH=  *
-DISTNAME=  XML-RSS-LibXML-0.3002
+DISTNAME=  XML-RSS-LibXML-0.3105
 REVISION=  1
 CATEGORIES=textproc
+
+CONFIGURE_STYLE=modbuild
 
 # Perl
 PERMIT_PACKAGE_CDROM=  Yes
Index: distinfo
===
RCS file: /home/open/cvs/ports/textproc/p5-XML-RSS-LibXML/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo18 Jan 2015 03:15:28 -  1.3
+++ distinfo21 Mar 2016 15:35:39 -
@@ -1,2 +1,2 @@
-SHA256 (XML-RSS-LibXML-0.3002.tar.gz) = 
GanWkeHtEZwjAbWMIp0i8kwzEkg+I8Mh6Ob1segzX2k=
-SIZE (XML-RSS-LibXML-0.3002.tar.gz) = 88719
+SHA256 (XML-RSS-LibXML-0.3105.tar.gz) = 
+ReWPRqarN9jrr1N4eFvOPQ1LNjpVqq3Rl6ne+jWtns=
+SIZE (XML-RSS-LibXML-0.3105.tar.gz) = 81621
Index: pkg/PLIST
===
RCS file: /home/open/cvs/ports/textproc/p5-XML-RSS-LibXML/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   6 Oct 2007 15:27:28 -   1.1.1.1
+++ pkg/PLIST   21 Mar 2016 15:37:11 -
@@ -8,6 +8,7 @@ ${P5SITE}/XML/RSS/LibXML/Namespaces.pm
 ${P5SITE}/XML/RSS/LibXML/Null.pm
 ${P5SITE}/XML/RSS/LibXML/V0_9.pm
 ${P5SITE}/XML/RSS/LibXML/V0_91.pm
+${P5SITE}/XML/RSS/LibXML/V0_92.pm
 ${P5SITE}/XML/RSS/LibXML/V1_0.pm
 ${P5SITE}/XML/RSS/LibXML/V2_0.pm
 @man man/man3p/XML::RSS::LibXML.3p



CVS: cvs.openbsd.org: ports

2016-03-21 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/03/21 12:17:18

Modified files:
graphics/img2pdf: Makefile 

Log message:
mirror the distfile, fetch failure reported by mmcc



Re: devel/autogen update

2016-03-21 Thread Michael McConville
Stuart Henderson wrote:
> On 2016/03/15 22:11, Michael McConville wrote:
> > I was trying to port GNU Complexity, but our autogen version is too
> > old. Below is an initial patch to update it. I've been planning to
> > run it through a bulk build, but my build machine has been giving me
> > issues. I'll get to it pretty soon, but if anyone else can once it's
> > ready, I'd appreciate it.
> 
> There are only 3 ports depending on it, a bulk build seems overkill.

I just tested, and they all built successfully for me.

How should we handle the problem with Guile version collision?



fix graphics/img2pdf distfiles

2016-03-21 Thread Michael McConville
I recently cleared the distfiles directory on my bulk build machine and
noticed that img2pdf was failing. I talked to upstream, who said he
recently switched packages for GitLab. He suggested the below approach,
which works for me.

The old WRKDIST is present but empty in the new archive, so I changed
that.

ok? Or is there a better way of doing this?


Index: Makefile
===
RCS file: /cvs/ports/graphics/img2pdf/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile17 Nov 2015 17:54:56 -  1.1.1.1
+++ Makefile21 Mar 2016 18:05:46 -
@@ -3,8 +3,9 @@
 COMMENT=   losslessly convert images to PDF
 
 MODPY_EGG_VERSION= 0.1.5
+REVISION=  0
 DISTNAME=  img2pdf-${MODPY_EGG_VERSION}
-DISTFILES= ${DISTNAME}.tar.bz2{archive.tar.bz2?ref=${MODPY_EGG_VERSION}}
+DISTFILES= ${DISTNAME}.tar.gz{archive.tar.gz?ref=${MODPY_EGG_VERSION}}
 
 CATEGORIES=graphics
 
@@ -19,7 +20,7 @@ MODULES=  lang/python
 MODPY_SETUPTOOLS= Yes
 RUN_DEPENDS=   graphics/py-Pillow
 
-WRKDIST=   ${WRKDIR}/img2pdf.git
+WRKDIST=   ${WRKDIR}/img2pdf-0.1.5-4e6a4b937807a2bb59aeecec01304d916137add4
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/img2pdf
Index: distinfo
===
RCS file: /cvs/ports/graphics/img2pdf/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo17 Nov 2015 17:54:56 -  1.1.1.1
+++ distinfo21 Mar 2016 18:05:46 -
@@ -1,2 +1,2 @@
-SHA256 (img2pdf-0.1.5.tar.bz2) = kmaV23K7nwNaMn5HwlafiJOJZ/HSPyhZMWstINKLTZI=
-SIZE (img2pdf-0.1.5.tar.bz2) = 23942
+SHA256 (img2pdf-0.1.5.tar.gz) = W1y6lPeRrnfDaIuCokSJCJq9yU+cqxB+A8KqaY7E0EA=
+SIZE (img2pdf-0.1.5.tar.gz) = 26423



CVS: cvs.openbsd.org: ports

2016-03-21 Thread Ricardo Mestre
CVSROOT:/cvs
Module name:ports
Changes by: mes...@cvs.openbsd.org  2016/03/21 11:41:52

Modified files:
textproc/urlview: Makefile 
textproc/urlview/patches: patch-urlview_c 

Log message:
pledge(2) urlview:

rpath: read config file
tty: the interface it's based on curses so it needs to do operations on tty
proc/exec: this is needed to actually launch the external program after
selecting the link

OK jca@ after his suggestions



Re: Vulnerable packages in ports 20/03/2016

2016-03-21 Thread Christian Weisgerber
On 2016-03-21, Sevan Janiyan  wrote:

> it'll probably bring a revision bump for a plethora of packages
> as they pull in pcre as well.

Presumably they use the shared library?

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



Re: [UPDATE] audio/mikmod to 3.2.7

2016-03-21 Thread Christian Weisgerber
On 2016-03-20, Adam Wolk  wrote:

> Tested with your updated audio/libmikmod running between2.mod
> on a march 18th amd64 snapsot 

Also works on sparc64.  As does xmms's mikmod module.

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



NEW: games/quakespasm 0.91.0 (was: Re: Ports not linked into the build)

2016-03-21 Thread Adam Wolk
On Tue, 22 Mar 2016 01:23:32 +1100
Jonathan Gray  wrote:

> On Mon, Mar 21, 2016 at 09:32:30AM -0400, Brandon Mercer wrote:
> > On Mon, Mar 21, 2016 at 10:29:32AM +0300, Kirill Bychkov wrote:  
> > > On Mon, March 21, 2016 00:38, Christian Weisgerber wrote:  
> > > > There are a number of ports that aren't linked to the build.
> > > > I can't quite tell for which this is intentional and where it
> > > > was simply forgotten:
> > > >
> > > > devel/rcs-fast-import
> > > > games/quake2
> > > > lang/compcert
> > > > lang/php/7.0
> > > > net/py-pcs
> > > > sysutils/autossh
> > > > www/mozilla-sync/*
> > > > x11/kde4/kalzium
> > > >
> > > > Also a number of firefox and kde4 language files, but I assume
> > > > those are intentional.
> > > >  
> > > Looks like autossh was replaced by mistake:  
> > 
> > The quake2 port has been removed. It wasn't working for about 2
> > years and has recently been replaced anyhow. Thanks Adam!
> >   
> 
> On a related note here is quakespasm 0.91.0 to replace games/quake.

Tested on amd64 snap mar 18th - the game works great, finished a full
level on full screen. Instructions were all clear (had to rename files
to lowercase). Not sure if it's an OK place to have a post installation
instructions in the package description instead of a pkg-readme but
it's not that long.

Generally OK awolk@ please get it to the tree and let's kill the old
quake port. I assume the same quirk as quake2 -> yquake2 will be
required for this port.

Regards,
Adam



CVS: cvs.openbsd.org: ports

2016-03-21 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/21 09:25:03

Modified files:
devel/libgit2/libgit2-glib: Makefile distinfo 
devel/libgit2/libgit2-glib/pkg: PLIST 

Log message:
update to libgit-glib-0.24.0



CVS: cvs.openbsd.org: ports

2016-03-21 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/21 09:24:20

Modified files:
devel/libgit2/libgit2: Makefile distinfo 

Log message:
update to libgit2-0.24.0



CVS: cvs.openbsd.org: ports

2016-03-21 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/21 09:24:35

Modified files:
devel/libgit2/py-git2: Makefile distinfo 
devel/libgit2/py-git2/pkg: PLIST 

Log message:
update to py-git2-0.24.0



Re: update print/poppler

2016-03-21 Thread Antoine Jacoutot
On Mon, Mar 21, 2016 at 02:53:42PM +0100, Matthias Kilian wrote:
> Hi,
> 
> this updates poppler to 0.42.0. It does *not* include the new utility
> pdfsig(1), because upstream forgot to include the manpage in the
> distfile, and because it would add security/nss and the kitchensink
> as dependencies to all subpackages. I prefer to wait for the next
> release and have a look again, but if anyone thinks I should include
> it in this update, please let me know.

We can always add a subpackage for it.

> 
> As always, tests are welcome. (I'm currently waiting for a dpb run
> on amd64 to finish and will then test several programs with it)
> 
> Ciao,
>   Kili
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/print/poppler/Makefile,v
> retrieving revision 1.103
> diff -u -p -r1.103 Makefile
> --- Makefile  27 Feb 2016 19:21:32 -  1.103
> +++ Makefile  21 Mar 2016 13:42:49 -
> @@ -6,7 +6,7 @@ COMMENT-qt4=  qt4 interface to PDF render
>  COMMENT-qt5= Qt5 interface to PDF rendering library
>  COMMENT-utils=   PDF conversion tools and utilities
>  
> -V=   0.41.0
> +V=   0.42.0
>  DISTNAME=poppler-$V
>  CATEGORIES=  print
>  PKGNAME-main=poppler-$V
> @@ -16,7 +16,7 @@ PKGNAME-qt4=poppler-qt4-$V
>  PKGNAME-qt5= poppler-qt5-$V
>  OLDSHIT =poppler-0.16.7
>  
> -SHARED_LIBS +=   poppler  34.0 # 58.0
> +SHARED_LIBS +=   poppler  35.0 # 58.0
>  SHARED_LIBS +=   poppler-glib 15.0 # 15.0
>  SHARED_LIBS +=   poppler-qt   12.0 # 3.0
>  SHARED_LIBS +=   poppler-qt4  18.0 # 13.0
> @@ -102,11 +102,12 @@ WANTLIB-qt4=${cWANTLIB} ${MODQT4_WAN
>   gobject-2.0 gthread-2.0 iconv intl lcms2 openjpeg \
>   png poppler pcre pthread-stubs xcb
>  WANTLIB-qt5= ${cWANTLIB} ${MODQT5_WANTLIB} ${MODGCC4_CPPWANTLIB} \
> - GL Qt5Core Qt5Gui Qt5Widgets Qt5Xml X11 X11-xcb Xau \
> - Xdamage Xdmcp Xext Xfixes Xxf86vm drm execinfo ffi glapi \
> - glib-2.0 gobject-2.0 gthread-2.0 iconv icudata icui18n \
> - icuuc intl lcms2 openjpeg pcre pcre16 png poppler \
> - pthread-stubs xcb xcb-dri2 xcb-glx
> + GL Qt5Core Qt5Gui Qt5Widgets Qt5Xml X11 X11-xcb \
> + Xdamage Xext Xfixes Xxf86vm drm execinfo ffi glapi \
> + glib-2.0 gobject-2.0 graphite2 gthread-2.0 harfbuzz \
> + iconv icudata icui18n icuuc intl lcms2 openjpeg pcre \
> + pcre16 png poppler pthread-stubs xcb xcb-dri2 xcb-glx
> + 
>  WANTLIB-utils=   X11 Xext Xrender c cairo fontconfig lcms2 m pixman-1 \
>   png pthread-stubs xcb xcb-render xcb-shm openjpeg \
>   poppler z ${cWANTLIB}
> @@ -117,7 +118,8 @@ CONFIGURE_ARGS+=--enable-xpdf-headers \
>   --enable-poppler-cpp \
>   --enable-utils \
>   --enable-zlib \
> - --disable-gtk-test
> + --disable-gtk-test \
> + --disable-libnss
>  
>  CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
>   LDFLAGS="-L${LOCALBASE}/lib" \
> Index: distinfo
> ===
> RCS file: /cvs/ports/print/poppler/distinfo,v
> retrieving revision 1.51
> diff -u -p -r1.51 distinfo
> --- distinfo  27 Feb 2016 19:21:32 -  1.51
> +++ distinfo  21 Mar 2016 13:42:49 -
> @@ -1,4 +1,4 @@
>  SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
> -SHA256 (poppler-0.41.0.tar.xz) = Qgq6q2PK7Z4e4olkoLohbRl5UGcmFkvJmtWt4okZKhs=
> +SHA256 (poppler-0.42.0.tar.xz) = n+8Hb/4qTxik4NpUfYFO9cXm+KKDr+M4dQSguxpBgBA=
>  SIZE (poppler-0.16.7.tar.gz) = 1952179
> -SIZE (poppler-0.41.0.tar.xz) = 1655448
> +SIZE (poppler-0.42.0.tar.xz) = 1674024
> Index: patches/patch-Makefile_in
> ===
> RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
> retrieving revision 1.12
> diff -u -p -r1.12 patch-Makefile_in
> --- patches/patch-Makefile_in 20 Nov 2015 07:47:44 -  1.12
> +++ patches/patch-Makefile_in 21 Mar 2016 13:42:49 -
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-Makefile_in,v 1.12 2015/11/20 07:47:44 kili Exp $
>  Makefile.in.orig Mon Nov 16 21:45:23 2015
> -+++ Makefile.in  Wed Nov 18 19:59:20 2015
> -@@ -386,6 +386,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
> +--- Makefile.in.orig Wed Mar 16 23:22:12 2016
>  Makefile.in  Mon Mar 21 11:04:17 2016
> +@@ -389,6 +389,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
>   POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
>   POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
>   POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
> @@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.12 2015/
>   POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
>   POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
>  

CVS: cvs.openbsd.org: ports

2016-03-21 Thread Michael McConville
CVSROOT:/cvs
Module name:ports
Changes by: m...@cvs.openbsd.org2016/03/21 08:39:27

Modified files:
mail/offlineimap: Makefile 
mail/offlineimap/pkg: DESCR 

Log message:
update DESCR

from maintainer, Remi Locherer



Re: Ports not linked into the build

2016-03-21 Thread Jonathan Gray
On Mon, Mar 21, 2016 at 09:32:30AM -0400, Brandon Mercer wrote:
> On Mon, Mar 21, 2016 at 10:29:32AM +0300, Kirill Bychkov wrote:
> > On Mon, March 21, 2016 00:38, Christian Weisgerber wrote:
> > > There are a number of ports that aren't linked to the build.
> > > I can't quite tell for which this is intentional and where it was
> > > simply forgotten:
> > >
> > > devel/rcs-fast-import
> > > games/quake2
> > > lang/compcert
> > > lang/php/7.0
> > > net/py-pcs
> > > sysutils/autossh
> > > www/mozilla-sync/*
> > > x11/kde4/kalzium
> > >
> > > Also a number of firefox and kde4 language files, but I assume those
> > > are intentional.
> > >
> > Looks like autossh was replaced by mistake:
> 
> The quake2 port has been removed. It wasn't working for about 2 years
> and has recently been replaced anyhow. Thanks Adam!
> 

On a related note here is quakespasm 0.91.0 to replace games/quake.


quakespasm.tgz
Description: application/tar-gz


update print/poppler

2016-03-21 Thread Matthias Kilian
Hi,

this updates poppler to 0.42.0. It does *not* include the new utility
pdfsig(1), because upstream forgot to include the manpage in the
distfile, and because it would add security/nss and the kitchensink
as dependencies to all subpackages. I prefer to wait for the next
release and have a look again, but if anyone thinks I should include
it in this update, please let me know.

As always, tests are welcome. (I'm currently waiting for a dpb run
on amd64 to finish and will then test several programs with it)

Ciao,
Kili

Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.103
diff -u -p -r1.103 Makefile
--- Makefile27 Feb 2016 19:21:32 -  1.103
+++ Makefile21 Mar 2016 13:42:49 -
@@ -6,7 +6,7 @@ COMMENT-qt4=qt4 interface to PDF render
 COMMENT-qt5=   Qt5 interface to PDF rendering library
 COMMENT-utils= PDF conversion tools and utilities
 
-V= 0.41.0
+V= 0.42.0
 DISTNAME=  poppler-$V
 CATEGORIES=print
 PKGNAME-main=  poppler-$V
@@ -16,7 +16,7 @@ PKGNAME-qt4=  poppler-qt4-$V
 PKGNAME-qt5=   poppler-qt5-$V
 OLDSHIT =  poppler-0.16.7
 
-SHARED_LIBS += poppler  34.0 # 58.0
+SHARED_LIBS += poppler  35.0 # 58.0
 SHARED_LIBS += poppler-glib 15.0 # 15.0
 SHARED_LIBS += poppler-qt   12.0 # 3.0
 SHARED_LIBS += poppler-qt4  18.0 # 13.0
@@ -102,11 +102,12 @@ WANTLIB-qt4=${cWANTLIB} ${MODQT4_WAN
gobject-2.0 gthread-2.0 iconv intl lcms2 openjpeg \
png poppler pcre pthread-stubs xcb
 WANTLIB-qt5=   ${cWANTLIB} ${MODQT5_WANTLIB} ${MODGCC4_CPPWANTLIB} \
-   GL Qt5Core Qt5Gui Qt5Widgets Qt5Xml X11 X11-xcb Xau \
-   Xdamage Xdmcp Xext Xfixes Xxf86vm drm execinfo ffi glapi \
-   glib-2.0 gobject-2.0 gthread-2.0 iconv icudata icui18n \
-   icuuc intl lcms2 openjpeg pcre pcre16 png poppler \
-   pthread-stubs xcb xcb-dri2 xcb-glx
+   GL Qt5Core Qt5Gui Qt5Widgets Qt5Xml X11 X11-xcb \
+   Xdamage Xext Xfixes Xxf86vm drm execinfo ffi glapi \
+   glib-2.0 gobject-2.0 graphite2 gthread-2.0 harfbuzz \
+   iconv icudata icui18n icuuc intl lcms2 openjpeg pcre \
+   pcre16 png poppler pthread-stubs xcb xcb-dri2 xcb-glx
+   
 WANTLIB-utils= X11 Xext Xrender c cairo fontconfig lcms2 m pixman-1 \
png pthread-stubs xcb xcb-render xcb-shm openjpeg \
poppler z ${cWANTLIB}
@@ -117,7 +118,8 @@ CONFIGURE_ARGS+=--enable-xpdf-headers \
--enable-poppler-cpp \
--enable-utils \
--enable-zlib \
-   --disable-gtk-test
+   --disable-gtk-test \
+   --disable-libnss
 
 CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.51
diff -u -p -r1.51 distinfo
--- distinfo27 Feb 2016 19:21:32 -  1.51
+++ distinfo21 Mar 2016 13:42:49 -
@@ -1,4 +1,4 @@
 SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.41.0.tar.xz) = Qgq6q2PK7Z4e4olkoLohbRl5UGcmFkvJmtWt4okZKhs=
+SHA256 (poppler-0.42.0.tar.xz) = n+8Hb/4qTxik4NpUfYFO9cXm+KKDr+M4dQSguxpBgBA=
 SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.41.0.tar.xz) = 1655448
+SIZE (poppler-0.42.0.tar.xz) = 1674024
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
retrieving revision 1.12
diff -u -p -r1.12 patch-Makefile_in
--- patches/patch-Makefile_in   20 Nov 2015 07:47:44 -  1.12
+++ patches/patch-Makefile_in   21 Mar 2016 13:42:49 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Makefile_in,v 1.12 2015/11/20 07:47:44 kili Exp $
 Makefile.in.orig   Mon Nov 16 21:45:23 2015
-+++ Makefile.inWed Nov 18 19:59:20 2015
-@@ -386,6 +386,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
+--- Makefile.in.orig   Wed Mar 16 23:22:12 2016
 Makefile.inMon Mar 21 11:04:17 2016
+@@ -389,6 +389,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
  POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
  POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
  POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.12 2015/
  POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
  POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
  POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
-@@ -448,6 +450,8 @@ infodir = @infodir@
+@@ -451,6 +453,8 @@ infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.12 2015/
  localedir = @localedir@
  

Re: [update] SABnzbd to 1.0.0

2016-03-21 Thread Aaron Bieber

Stuart Henderson writes:

> On 2016/03/16 19:47, Juan Francisco Cantero Hurtado wrote:
>> > +EXTRACT_SUFX =.tar.gz
>> 
>> EXTRACT_SUFX always defaults to .tar.gz.
>
> With that fixed it reads well to me. But I have no way to test this.

I have tested, OK abieber@.



Re: Ports not linked into the build

2016-03-21 Thread Brandon Mercer
On Mon, Mar 21, 2016 at 10:29:32AM +0300, Kirill Bychkov wrote:
> On Mon, March 21, 2016 00:38, Christian Weisgerber wrote:
> > There are a number of ports that aren't linked to the build.
> > I can't quite tell for which this is intentional and where it was
> > simply forgotten:
> >
> > devel/rcs-fast-import
> > games/quake2
> > lang/compcert
> > lang/php/7.0
> > net/py-pcs
> > sysutils/autossh
> > www/mozilla-sync/*
> > x11/kde4/kalzium
> >
> > Also a number of firefox and kde4 language files, but I assume those
> > are intentional.
> >
> Looks like autossh was replaced by mistake:

The quake2 port has been removed. It wasn't working for about 2 years
and has recently been replaced anyhow. Thanks Adam!



UPDATE: editors/le

2016-03-21 Thread Ivan "Rambius" Ivanov
Hello,

Here is a patch that updates editors/le from 1.15.1 to 1.16.1.

OK?

Regards
Rambius

-- 
Tangra Mega Rock: http://www.radiotangra.com
Index: Makefile
===
RCS file: /cvs/ports/editors/le/Makefile,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile
--- Makefile	23 Dec 2014 18:34:47 -	1.2
+++ Makefile	21 Mar 2016 13:29:02 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.2 2014/12/23 18:34:47 bcallah Exp $
 
 COMMENT =	text editor inspired by Norton Commander
-DISTNAME =	le-1.15.1
+DISTNAME =	le-1.16.1
 CATEGORIES =	editors
 
 HOMEPAGE =	http://lav.yar.ru/programs.html
Index: distinfo
===
RCS file: /cvs/ports/editors/le/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- distinfo	23 Dec 2014 18:34:47 -	1.2
+++ distinfo	21 Mar 2016 13:29:02 -
@@ -1,2 +1,2 @@
-SHA256 (le-1.15.1.tar.gz) = fjXWMfWIKW/RqWbwZxCrC7+UnWPAIBoE6x4kAcZUs+c=
-SIZE (le-1.15.1.tar.gz) = 847146
+SHA256 (le-1.16.1.tar.gz) = VLc4IFT2n0r4qQmNGWxkY1CCGfXUzrRsFigWWGHnhrU=
+SIZE (le-1.16.1.tar.gz) = 977143
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/le/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- pkg/PLIST	19 Sep 2014 22:23:29 -	1.1.1.1
+++ pkg/PLIST	21 Mar 2016 13:29:02 -
@@ -9,9 +9,10 @@ share/le/colors-defbg
 share/le/colors-green
 share/le/colors-white
 share/le/help
+share/le/keymap-default
 share/le/keymap-emacs
 share/le/le.hlp
-share/le/mainmenu
+share/le/mainmenu-default
 share/le/mainmenu-ru
 share/le/syntax
 share/le/syntax.d/
@@ -33,12 +34,15 @@ share/le/syntax.d/javascript
 share/le/syntax.d/logrotate-conf
 share/le/syntax.d/lout
 share/le/syntax.d/make-file
+share/le/syntax.d/markdown
 share/le/syntax.d/metafont
 share/le/syntax.d/named-conf
+share/le/syntax.d/nroff
 share/le/syntax.d/ocaml
 share/le/syntax.d/pascal
 share/le/syntax.d/perl
 share/le/syntax.d/php
+share/le/syntax.d/pod
 share/le/syntax.d/python
 share/le/syntax.d/sather
 share/le/syntax.d/shell


CVS: cvs.openbsd.org: ports

2016-03-21 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/21 07:16:17

Modified files:
devel/autoconf-archive: Makefile distinfo 
devel/autoconf-archive/pkg: PLIST 

Log message:
update to autoconf-archive-2016.03.20



CVS: cvs.openbsd.org: ports

2016-03-21 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/21 06:58:42

Modified files:
devel/spice-protocol: Makefile 
devel/spice-protocol/patches: patch-spice_macros_h 

Log message:
use a simpler solution in the patch



Re: Ports not linked into the build

2016-03-21 Thread Adam Wolk
On Sun, 20 Mar 2016 22:38:30 +0100
Christian Weisgerber  wrote:

> There are a number of ports that aren't linked to the build.
> I can't quite tell for which this is intentional and where it was
> simply forgotten:
> 
> devel/rcs-fast-import
> games/quake2

I killed the port on request from bmercer@

The games/quake2 port has been superseded by games/yquake2
the port has also been disabled from the build 2 months
ago (rev 1.326 by bmercer) and was itself broken before that.

> lang/compcert
> lang/php/7.0
> net/py-pcs
> sysutils/autossh
> www/mozilla-sync/*
> x11/kde4/kalzium
> 
> Also a number of firefox and kde4 language files, but I assume those
> are intentional.
> 



CVS: cvs.openbsd.org: ports

2016-03-21 Thread Adam Wolk
CVSROOT:/cvs
Module name:ports
Changes by: aw...@cvs.openbsd.org   2016/03/21 06:43:35

Removed files:
games/quake2   : Makefile distinfo 
games/quake2/files: snd_sndio.c 
games/quake2/patches: patch-configure 
  patch-data_baseq2_config_cfg 
  patch-src_Makefile_in 
  patch-src_baseq2_g_local_h 
  patch-src_ctf_g_local_h patch-src_gl_glx_c 
  patch-src_gl_rmain_c patch-src_glw_h 
  patch-src_q_sh_c patch-src_qgl_c 
  patch-src_rw_x11_c patch-src_snd_dma_c 
  patch-src_sv_world_c patch-src_vid_menu_c 
games/quake2/pkg: DESCR MESSAGE PLIST 

Log message:
Remove games/quake2 on request from bmercer@

The games/quake2 port has been superseded by games/yquake2
the port has also been disabled from the build 2 months
ago (rev 1.326 by bmercer)



CVS: cvs.openbsd.org: ports

2016-03-21 Thread David Coppa
CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/03/21 06:42:31

Modified files:
audio/mpd  : Makefile distinfo 
Added files:
audio/mpd/patches: patch-src_notify_hxx 

Log message:
Update to mpd-0.19.14



Re: Vulnerable packages in ports 20/03/2016

2016-03-21 Thread Sevan Janiyan


On 21/03/2016 02:46, Michael McConville wrote:
> Looks like PCRE 8.39 isn't being mirrored yet. Should we patch manually?
> That looks like a pretty serious vulnerability:
> 
> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-3191

Hi Michael,
Ideally, it'll probably bring a revision bump for a plethora of packages
as they pull in pcre as well.


Sevan



CVS: cvs.openbsd.org: ports

2016-03-21 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/21 04:11:18

Modified files:
devel/git  : Tag: OPENBSD_5_9 Makefile distinfo 
devel/git/patches: Tag: OPENBSD_5_9 
   patch-t_t9200-git-cvsexportcommit_sh 
   patch-t_test-lib_sh 
devel/git/pkg  : Tag: OPENBSD_5_9 PLIST-main 

Log message:
Update to git-2.7.4.

ok benoit@ (MAINTAINER)



CVS: cvs.openbsd.org: ports

2016-03-21 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/03/21 04:04:43

Modified files:
lang/php   : Makefile 

Log message:
add commented-out entry for 7.0 with explanation of why it's not enabled yet



CVS: cvs.openbsd.org: ports

2016-03-21 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/21 04:03:47

Modified files:
devel/git  : Tag: OPENBSD_5_8 Makefile distinfo 
devel/git/patches: Tag: OPENBSD_5_8 patch-t_test-lib_sh 

Log message:
update to git-2.4.11, addressing multiple security/stability issues

ok benoit@ (MAINTAINER)



CVS: cvs.openbsd.org: ports

2016-03-21 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/21 03:41:42

Modified files:
www/firefox-esr-i18n: Tag: OPENBSD_5_8 Makefile.inc distinfo 

Log message:
sync w/ firefox-esr



CVS: cvs.openbsd.org: ports

2016-03-21 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/03/21 03:41:04

Modified files:
www/firefox-esr: Tag: OPENBSD_5_8 Makefile distinfo 

Log message:
update to firefox-esr-38.7.1



Re: [NEW] www/pnp4nagios

2016-03-21 Thread Vadim Zhukov
2016-03-20 10:35 GMT+03:00 Kirill Bychkov :
> On Fri, March 11, 2016 12:16, Kirill Bychkov wrote:
>> On Thu, March 10, 2016 23:22, Vadim Zhukov wrote:
>>> 2016-03-09 17:08 GMT+03:00 Kirill Bychkov :
 On Thu, March 3, 2016 16:57, Kirill Bychkov wrote:
> Him guys!
> This is a port of PNP4Nagios, an addon for Nafios and Oconga for analyzing
> performance data and storing it in RRD.
> Current port is partially based on an old one from henning@ [1] and tested
> for more than a month with Icinga 1.x processing data from about 400
> hosts.
> It could be splitted to Nagios and Icinga 2.x flavors if there are some
> interest in them and one can test it with.
>
> [1] http://marc.info/?l=openbsd-ports=140803165912579=2
>
> Comments? OKs?
 Objections? :)
>
> ping
>

 Updated tarball with fixed typos.
>>>
>>> Here are some more nits:
>>>
>>> ... in Makefile:
>>>
 INSTALL_OPTS="-o roog -g bin" \
>>>
>>> One more tyop. ;)
>>>
 SYSCONFDIR =${BASESYSCONFDIR}/pnp4nagios/
 LOCALSTATEDIR = ${BASELOCALSTATEDIR}/pnp4nagios
>>>
>>> Why slash is added in one case but not in the other?
>>>
>>>
 # fix broken symlink in tarball
>>>
>>> If this symlink gets packaged, then it should be relative one, like:
>>>
>>> ln -sf ../en_US/dwnld.html \
>>> ${WRKSRC}/share/pnp/documents/de_DE/dwnld.html
>>>
>>> ... in patches:
>>>
>>> At least patch-sample-config_httpd_conf_in needs justification, why it's
>>> needed.
>>>
>>> ... in pkg/README-cgi:
>>>
 Apache2 configuration for PNP4Nagios is stored under:
 /var/conf/modules.sample/pnp4nagios.conf
>>>
>>> /var/conf? I suppose this should be ${LOCALSTATEDIR}/apache2/conf, or
>>> something like that.
>>>
>>> ... in pkg/PLIST-main:
>>>
>>> Is it intended that not all share/example/* stuff has its @sample
>>> counterpart under ${SYSCONFDIR}?
>>>
 share/doc/pkg-readmes/${FULLPKGNAME}
 @owner _icinga
 @sample ${LOCALSTATEDIR}/
 @sample ${LOCALSTATEDIR}/stats/
 @sample /var/log/pnp4nagios.log
>>>
>>> I'm not sure the latter is supposed to work, or won't fail at some
>>> point in the future. @sample, when applied to a file, mean "take the
>>> file from the line above and copy it here". And you have a non-files
>>> line above up to README one. If you want to create an empty file owned
>>> by someone, you may either use something like:
>>>
>>> @exec-add test -e /var/log/pnp4nagios.log || install -o _nagios -g
>>> _nagios -m 0640 /dev/null /var/log/pnp4nagios.log
>>> @extraunexec test -s /var/log/pnp4nagios || rm -f /var/log/pnp4nagios.log
>>>
>>> or use /var/log/pnp4nagios/ directory instead, owned by _nagios, where
>>> application could create/rename/remove files without problem. I'd
>>> recommend go the 2nd way, as we usually do.
>>>
>>> --
>>>   WBR,
>>>   Vadim Zhukov
>>>
>> Updated tarball attached. Also added some extraunexec lines.
>> Diff to illustrate changes:
>>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/www/pnp4nagios/Makefile,v
>> retrieving revision 1.8
>> diff -u -r1.8 Makefile
>> --- Makefile3 Mar 2016 21:38:50 -   1.8
>> +++ Makefile11 Mar 2016 09:14:15 -
>> @@ -29,10 +29,10 @@
>> net/icinga/web \
>> www/pnp4nagios,-main
>>
>> -FAKE_FLAGS =   INSTALL_OPTS="-o roog -g bin" \
>> -   SYSCONFDIR=${PREFIX}/share/examples/pnp4nagios/
>> +FAKE_FLAGS =   INSTALL_OPTS="-o root -g bin" \
>> +   SYSCONFDIR=${PREFIX}/share/examples/pnp4nagios
>>
>> -SYSCONFDIR =   ${BASESYSCONFDIR}/pnp4nagios/
>> +SYSCONFDIR =   ${BASESYSCONFDIR}/pnp4nagios
>>  LOCALSTATEDIR =${BASELOCALSTATEDIR}/pnp4nagios
>>
>>  CONFIGURE_STYLE =  gnu
>> @@ -41,7 +41,7 @@
>> --libexecdir=${PREFIX}/libexec/nagios \
>> --with-perfdata-dir=/var/www/pnp4nagios/rrd \
>> --with-perfdata-spool-dir=/var/spool/icinga \
>> -   --with-perfdata-logfile=/var/log/pnp4nagios.log
>> +
>> --with-perfdata-logfile=/var/log/pnp4nagios/pnp4nagios.log
>>
>>  MULTI_PACKAGES =   -main -cgi
>>  PREFIX-cgi =   ${VARBASE}/www
>> cvs server: Diffing patches
>> Index: patches/patch-sample-config_httpd_conf_in
>> ===
>> RCS file:
>> /cvs/ports/www/pnp4nagios/patches/patch-sample-config_httpd_conf_in,v
>> retrieving revision 1.1
>> diff -u -r1.1 patch-sample-config_httpd_conf_in
>> --- patches/patch-sample-config_httpd_conf_in   8 Feb 2016 22:31:55 -
>>  1.1
>> +++ patches/patch-sample-config_httpd_conf_in   11 Mar 2016 09:14:15 -
>> @@ -1,4 +1,7 @@
>>  $OpenBSD$
>> +
>> +Do not block access by default.
>> +
>>  --- sample-config/httpd.conf.in.orig   Sun Feb  7 15:00:14 2016
>> 

Re: Fix japanese/less

2016-03-21 Thread Bryan Linton
On 2016-03-21 21:28:17, Peter Kane  wrote:
> On Mon, Mar 21, 2016 at 06:59:18PM +1300, Peter Kane wrote:
> > 
> > Thanks for the detailed notes. I'll give it another go shortly.
> > 
> > Peter
> 
> OK, I take it all back, partly.
> 
> At first it wasn't working at all but after a few or more Xorg restarts it 
> began to show signs of life. I unloaded a lot of the conversion engines that 
> I didn't want and added "set encoding=utf-8" in a vimrc file. However, the 
> uim-toolbar-gtk often doesn't launch properly on startup for me so I have to 
> wait a while and try again (I would just get a preferences icon). The 
> keyboard switching also seemed erratic and laggy. The anthy part runs as 
> root.  
> 
> On the whole it wasn't a great user experience, but jvim isn't really any 
> better. Maybe I can refine the settings further to make it better. Thanks 
> again.
> 

To be honest, I'm not really sure what advice to offer.  For me,
switching between input methods is nigh instantaneous.  I also
don't have any anthy processes running according to pgrep or top;
UIM handles connections to it internally.

Can you post your entire .xinitrc file?  Obviously redacting any
information that needs to be.

Also, can you try the following:

1) Launch uim-pref-gtk
2) Under the first page that opens (Global settings), under
"Advanced settings", does checking/unchecking the "Enable lazy
input method loading for fast startup" have any effect on
anything?

On my setup, that option is checked and I don't have any problems,
but YMMV.

-- 
Bryan



Re: UPDATE: math/R

2016-03-21 Thread David Coppa
On Sat, Mar 19, 2016 at 12:21 PM, Ingo Feinerer  wrote:
> Update math/R 3.2.3 -> 3.2.4
>
> OK?

Yes, ok with me.

> Best regards,
> Ingo

Ciao!
David

> Index: Makefile
> ===
> RCS file: /cvs/ports/math/R/Makefile,v
> retrieving revision 1.80
> diff -u -p -r1.80 Makefile
> --- Makefile18 Mar 2016 23:12:18 -  1.80
> +++ Makefile19 Mar 2016 11:18:49 -
> @@ -1,8 +1,7 @@
>  # $OpenBSD: Makefile,v 1.80 2016/03/18 23:12:18 naddy Exp $
>
>  COMMENT=   powerful math/statistics/graphics language
> -DISTNAME=  R-3.2.3
> -REVISION=  0
> +DISTNAME=  R-3.2.4
>
>  SO_VERSION=31.2
>  .for _lib in R Rblas Rlapack
> Index: distinfo
> ===
> RCS file: /cvs/ports/math/R/distinfo,v
> retrieving revision 1.27
> diff -u -p -r1.27 distinfo
> --- distinfo14 Dec 2015 16:49:02 -  1.27
> +++ distinfo19 Mar 2016 11:18:49 -
> @@ -1,2 +1,2 @@
> -SHA256 (R-3.2.3.tar.gz) = uTt9h4E4J5I0Fg8AfLm3+BuKcsASoVVm6exTlc/ZtsE=
> -SIZE (R-3.2.3.tar.gz) = 29816176
> +SHA256 (R-3.2.4.tar.gz) = uv1AX+nC/ju+R6incwrRIPA7ffn7D2FnT8oZzwYd01A=
> +SIZE (R-3.2.4.tar.gz) = 29879523
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/math/R/pkg/PLIST,v
> retrieving revision 1.28
> diff -u -p -r1.28 PLIST
> --- pkg/PLIST   28 Sep 2015 07:32:19 -  1.28
> +++ pkg/PLIST   19 Mar 2016 11:18:49 -
> @@ -200,6 +200,7 @@ lib/R/library/Matrix/Copyrights
>  lib/R/library/Matrix/DESCRIPTION
>  lib/R/library/Matrix/Doxyfile
>  lib/R/library/Matrix/INDEX
> +lib/R/library/Matrix/LICENCE
>  lib/R/library/Matrix/Meta/
>  lib/R/library/Matrix/Meta/Rd.rds
>  lib/R/library/Matrix/Meta/data.rds
>



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



Re: Fix japanese/less

2016-03-21 Thread Peter Kane
On Mon, Mar 21, 2016 at 06:59:18PM +1300, Peter Kane wrote:
> On Sun, Mar 20, 2016 at 05:46:25PM +0900, Bryan Linton wrote:
> > On 2016-03-20 11:17:25, Peter Kane  wrote:
> > > 
> > > I use jserver/kinput2 because it works with cwm and I can run it on a 
> > > legacy i386 system and connect over ssh from an amd64 machine (I was 
> > > hoping the new vmd development work would help there, but i386 support 
> > > seems a way off). The new UTF-8 desktop settings in -current work OK for 
> > > me to display UTF-8 fonts, it is just the occasional inputting of kanji 
> > > that I need something for. If someone can show how to use uim/anthy with 
> > > cwm in a non-root manner I would be grateful. 
> > > 
> > > uim does have appeal because it supports a wide range of languages and I 
> > > would like something for Chinese, too.
> > > 
> > 
> > It's been a long time since I installed and configured uim/anthy
> > (it Just Works), so I may not remember all the steps it took, but
> > it's fairly straightforward.
> > 
> > These are the installed ports I have:
> > anthy-9100hp1   japanese input method
> > uim-1.8.6p1 multilingual input method library
> > uim-gtk-1.8.6p1 uim for GTK+2
> > uim-gtk3-1.8.6p2uim for GTK+3
> > uim-kde-1.8.6p1 uim for KDE3
> > uim-qt4-1.8.6p1 uim for QT4
> > uim-tomoe-gtk-0.6.0 japanese handwriting
> > 
> > In .xinitrc (non-relevant lines omitted):
> > [...]
> > export XMODIFIERS=@im=uim
> > export GTK_IM_MODULE="uim"
> > export QT_IM_MODULE="uim"
> > env LC_CTYPE=ja_JP.UTF-8 uim-xim &
> > [...]
> > exec env LC_CTYPE="en_US.UTF-8" /usr/X11R6/bin/cwm
> > 
> > Quite frankly, I can't remember why I put the 
> > "env LC_CTYPE=ja_JP.UTF-8" and 'env LC_CTYPE="en_US.UTF-8"' lines
> > in there.  I think at one point they mattered, but with the base
> > system having/being switched to UTF-8 by default, they may no
> > longer be necessary.
> > 
> > After that, simply typing "startx" will bring up CWM with a
> > working IME.
> > 
> > Running /usr/local/bin/uim-pref-gtk will bring up a GUI you can
> > use to configure UIM.  There are probably *way* more options here
> > than you'll need.  Configuring the keyboard shortcut you want to
> > use to switch input methods is probably the only one you'll really
> > need at first.  I have mine set up to toggle between an IPA
> > keyboard (for inputting linguistics-related symbols), a regular
> > keyboard, and the anthy IME.
> > 
> > You can also run one of:
> > uim-toolbar-gtk
> > uim-toolbar-gtk3
> > uim-toolbar-qt4
> > uim-toolbar-gtk-systray
> > uim-toolbar-gtk3-systray
> > 
> > If you want a GUI-toolbar or systray application to run that lets
> > you click on buttons to toggle/switch between IMEs.  Though
> > personally, I find them to be superfluous, especially in a
> > minimalist windowmanager like CWM.
> > 
> > Please let me know if you're successful in setting up UIM/anthy
> > with this information; I can always try to offer better advice :)
> > 
> > -- 
> > Bryan
> > 
> 
> Thanks for the detailed notes. I'll give it another go shortly.
> 
> Peter

OK, I take it all back, partly.

At first it wasn't working at all but after a few or more Xorg restarts it 
began to show signs of life. I unloaded a lot of the conversion engines that I 
didn't want and added "set encoding=utf-8" in a vimrc file. However, the 
uim-toolbar-gtk often doesn't launch properly on startup for me so I have to 
wait a while and try again (I would just get a preferences icon). The keyboard 
switching also seemed erratic and laggy. The anthy part runs as root.  

On the whole it wasn't a great user experience, but jvim isn't really any 
better. Maybe I can refine the settings further to make it better. Thanks again.

Peter



CVS: cvs.openbsd.org: ports

2016-03-21 Thread Benoit Lecocq
CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2016/03/21 02:17:33

Modified files:
math/ntl   : Makefile distinfo 
math/ntl/patches: patch-src_VERSION_INFO 

Log message:
Update to ntl-9.7.0.



CVS: cvs.openbsd.org: ports

2016-03-21 Thread Kirill Bychkov
CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2016/03/21 01:31:22

Modified files:
sysutils   : Makefile 

Log message:
add autossh back. was replaced by mistake.



CVS: cvs.openbsd.org: ports

2016-03-21 Thread Sebastian Reitenbach
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2016/03/21 01:32:43

Modified files:
security/tcltls: Makefile 

Log message:
Unbreak, no SSLv3 anymore, with this at least, net/coccinella can
use TLS again to connect to xmpp server



Re: Ports not linked into the build

2016-03-21 Thread Kirill Bychkov
On Mon, March 21, 2016 00:38, Christian Weisgerber wrote:
> There are a number of ports that aren't linked to the build.
> I can't quite tell for which this is intentional and where it was
> simply forgotten:
>
> devel/rcs-fast-import
> games/quake2
> lang/compcert
> lang/php/7.0
> net/py-pcs
> sysutils/autossh
> www/mozilla-sync/*
> x11/kde4/kalzium
>
> Also a number of firefox and kde4 language files, but I assume those
> are intentional.
>
Looks like autossh was replaced by mistake:

--- Makefile11 Dec 2015 00:44:06 -  1.367
+++ Makefile6 Jan 2016 15:54:00 -   1.368
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.367 2015/12/11 00:44:06 jturner Exp $
+# $OpenBSD: Makefile,v 1.368 2016/01/06 15:54:00 ajacoutot Exp $

  SUBDIR =
  SUBDIR += accountsservice
@@ -8,7 +8,7 @@
  SUBDIR += apcd
  SUBDIR += apcupsd
  SUBDIR += augeas
- SUBDIR += autossh
+ SUBDIR += awscli
  SUBDIR += backuppc
  SUBDIR += bacula
  SUBDIR += bchunk

Adding it back.



CVS: cvs.openbsd.org: ports

2016-03-21 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/03/21 01:24:01

Modified files:
astro/stellarium: Makefile distinfo 
astro/stellarium/pkg: PLIST 

Log message:
Update to stellarium-0.14.3.



CVS: cvs.openbsd.org: ports

2016-03-21 Thread Sebastian Reitenbach
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2016/03/21 01:22:23

Modified files:
net/nagios : Makefile 

Log message:
hook up check_rabbitmq



CVS: cvs.openbsd.org: ports

2016-03-21 Thread Sebastian Reitenbach
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2016/03/21 01:21:26

Log message:
import check_rabbitmq

This package contains a set of nagios checks useful for monitoring a
RabbitMQ server. They use the RabbitMQ management interface with is over
HTTP and therefore have a very light profile on the nagios server.

Feedback and suggestions, as well as Ok jca@

Status:

Vendor Tag: sebastia
Release Tags:   sebastia_20160321

N ports/net/nagios/check_rabbitmq/distinfo
N ports/net/nagios/check_rabbitmq/Makefile
N ports/net/nagios/check_rabbitmq/pkg/DESCR
N ports/net/nagios/check_rabbitmq/pkg/PLIST

No conflicts created by this import



Re: Ports not linked into the build

2016-03-21 Thread Vadim Zhukov
21 марта 2016 г. 1:01 пользователь "Christian Weisgerber" <
na...@mips.inka.de> написал:
>
> There are a number of ports that aren't linked to the build.
> I can't quite tell for which this is intentional and where it was
> simply forgotten:
>
> devel/rcs-fast-import
> games/quake2
> lang/compcert
> lang/php/7.0
> net/py-pcs
> sysutils/autossh
> www/mozilla-sync/*
> x11/kde4/kalzium

This one is on purpose. It was not ready at the time KDE4 was done, so it
was disabled. It was easier to me to have whole KDE SC with some parts
disabled, rather than removing ones not used. I'll take a quick look later
today and decide what to do: fix or remove.

> Also a number of firefox and kde4 language files, but I assume those
> are intentional.

Languages get added, removed and added again all over the time... Butt for
KDE4 there won't be any updates in that regard, by definition. Thank you
for reminding, I'll clean those a bit later.

--
WBR,
  Vadim Zhukov


Re: Fix japanese/less

2016-03-21 Thread Peter Kane
On Sun, Mar 20, 2016 at 05:46:25PM +0900, Bryan Linton wrote:
> On 2016-03-20 11:17:25, Peter Kane  wrote:
> > 
> > I use jserver/kinput2 because it works with cwm and I can run it on a 
> > legacy i386 system and connect over ssh from an amd64 machine (I was hoping 
> > the new vmd development work would help there, but i386 support seems a way 
> > off). The new UTF-8 desktop settings in -current work OK for me to display 
> > UTF-8 fonts, it is just the occasional inputting of kanji that I need 
> > something for. If someone can show how to use uim/anthy with cwm in a 
> > non-root manner I would be grateful. 
> > 
> > uim does have appeal because it supports a wide range of languages and I 
> > would like something for Chinese, too.
> > 
> 
> It's been a long time since I installed and configured uim/anthy
> (it Just Works), so I may not remember all the steps it took, but
> it's fairly straightforward.
> 
> These are the installed ports I have:
>   anthy-9100hp1   japanese input method
>   uim-1.8.6p1 multilingual input method library
>   uim-gtk-1.8.6p1 uim for GTK+2
>   uim-gtk3-1.8.6p2uim for GTK+3
>   uim-kde-1.8.6p1 uim for KDE3
>   uim-qt4-1.8.6p1 uim for QT4
>   uim-tomoe-gtk-0.6.0 japanese handwriting
> 
> In .xinitrc (non-relevant lines omitted):
>   [...]
>   export XMODIFIERS=@im=uim
>   export GTK_IM_MODULE="uim"
>   export QT_IM_MODULE="uim"
>   env LC_CTYPE=ja_JP.UTF-8 uim-xim &
>   [...]
>   exec env LC_CTYPE="en_US.UTF-8" /usr/X11R6/bin/cwm
> 
> Quite frankly, I can't remember why I put the 
> "env LC_CTYPE=ja_JP.UTF-8" and 'env LC_CTYPE="en_US.UTF-8"' lines
> in there.  I think at one point they mattered, but with the base
> system having/being switched to UTF-8 by default, they may no
> longer be necessary.
> 
> After that, simply typing "startx" will bring up CWM with a
> working IME.
> 
> Running /usr/local/bin/uim-pref-gtk will bring up a GUI you can
> use to configure UIM.  There are probably *way* more options here
> than you'll need.  Configuring the keyboard shortcut you want to
> use to switch input methods is probably the only one you'll really
> need at first.  I have mine set up to toggle between an IPA
> keyboard (for inputting linguistics-related symbols), a regular
> keyboard, and the anthy IME.
> 
> You can also run one of:
>   uim-toolbar-gtk
>   uim-toolbar-gtk3
>   uim-toolbar-qt4
>   uim-toolbar-gtk-systray
>   uim-toolbar-gtk3-systray
> 
> If you want a GUI-toolbar or systray application to run that lets
> you click on buttons to toggle/switch between IMEs.  Though
> personally, I find them to be superfluous, especially in a
> minimalist windowmanager like CWM.
> 
> Please let me know if you're successful in setting up UIM/anthy
> with this information; I can always try to offer better advice :)
> 
> -- 
> Bryan
> 

Thanks for the detailed notes. I'll give it another go shortly.

Peter