CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/01/28 08:56:28

Modified files:
databases/redis: Makefile distinfo 

Log message:
Upstream replaced source distfile.

Spotted by nigel@, thanks!

Re: RFC: update productivity/taskd to v1.1.0

[viq]

On pią, 2016-01-22 at 10:23 -0600, Kent R. Spillner wrote:
> On Wed, Jan 20, 2016 at 01:57:43PM -0600, Kent R. Spillner wrote:
> > Below is a new diff.  We finally tracked down the certificate
> > validation
> > bug with help from viq and upstream, and the new patch for that has
> > already been merged upstream (along with several of our other
> > patches
> > which can all go away when v1.2.0 is released).  In this version of
> > the
> > diff I've updated the README and also take MAINTAINER.
> > 
> > Ok?
> 
> bump
> 
> I'm not sure how many people use taskd but it'd be nice to get some
> test
> reports for i386 and other architectures.  I've been running this on
> amd64 for the past several days, sync'ing with taskwarrior on OpenBSD
> as
> well as Linux.  If anyone uses other clients, or runs taskwarrior on
> other OS x, such test reports would be great, too.

I tried to finally have a look at this, and the patch does not apply
cleanly, though I guess mostly because of the funky characters. Could
you maybe attach the patch instead of having it inline? It would make
it easier to make sure I have a version that hasn't been mangled
somewhere along the way.

> Index: Makefile
> ===
> RCS file: /work/cvsroot/ports/productivity/taskd/Makefile,v
> retrieving revision 1.4
> diff -p -u -r1.4 Makefile
> --- Makefile  25 Aug 2015 07:30:30 -  1.4
> +++ Makefile  20 Jan 2016 19:41:51 -
> @@ -2,23 +2,27 @@
>  
>  COMMENT =lightweight server providing access to task data
>  
> -DISTNAME =   taskd-1.0.0
> +DISTNAME =   taskd-1.1.0
>  CATEGORIES = productivity net
> -REVISION =   1
>  
>  HOMEPAGE =   http://www.taskwarrior.org/
>  
> +MAINTAINER = Kent R. Spillner 
> +
>  MASTER_SITES =   ${HOMEPAGE}/download/
>  
>  # MIT
>  PERMIT_PACKAGE_CDROM =   Yes
>  
> -MODULES =devel/cmake
> +MODULES =gcc4 \
> + devel/cmake
> +
> +MODGCC4_LANGS =  c++
> +MODGCC4_ARCHS =  *
>  
> -WANTLIB += c gnutls m pthread stdc++ uuid
> +WANTLIB += c gnutls m pthread
>  
> -LIB_DEPENDS =security/gnutls \
> - sysutils/e2fsprogs>=1.42.7
> +LIB_DEPENDS =security/gnutls
>  
>  CONFIGURE_STYLE =cmake
>  
> @@ -33,10 +37,11 @@ NO_TEST = Yes
>  
>  post-install:
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/taskd/pki/
> - ${INSTALL_SCRIPT} ${WRKSRC}/pki/!(*.orig) \
> + ${INSTALL_SCRIPT} ${WRKSRC}/pki/generate!(*.orig) \
> + ${PREFIX}/share/examples/taskd/pki/
> + ${INSTALL_DATA} ${WRKSRC}/pki/README \
>   ${PREFIX}/share/examples/taskd/pki/
>   ${SUBST_DATA} ${FILESDIR}/config \
>   ${PREFIX}/share/examples/taskd/config
> - ${INSTALL_DATA} ${FILESDIR}/vars.dist
> ${PREFIX}/share/examples/taskd/pki/
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /work/cvsroot/ports/productivity/taskd/distinfo,v
> retrieving revision 1.1.1.1
> diff -p -u -r1.1.1.1 distinfo
> --- distinfo  12 Jul 2014 22:08:35 -  1.1.1.1
> +++ distinfo  10 Nov 2015 21:12:00 -
> @@ -1,2 +1,2 @@
> -SHA256 (taskd-1.0.0.tar.gz) =
> Fi7x7sSPgUWHDvDb4BIbeKbamYFbwYr3feB/uwq+AtA=
> -SIZE (taskd-1.0.0.tar.gz) = 128191
> +SHA256 (taskd-1.1.0.tar.gz) =
> e4SI5oeXGuVnKf9OLlIJ/4gGz4zVdxi/1+UhvhMGIbQ=
> +SIZE (taskd-1.1.0.tar.gz) = 120115
> Index: files/config
> ===
> RCS file: /work/cvsroot/ports/productivity/taskd/files/config,v
> retrieving revision 1.1.1.1
> diff -p -u -r1.1.1.1 config
> --- files/config  12 Jul 2014 22:08:35 -  1.1.1.1
> +++ files/config  14 Jan 2016 19:56:20 -
> @@ -1,12 +1,12 @@
>  confirmation=1
>  extensions=${TRUEPREFIX}/libexec/taskd
>  log=/var/log/taskd/taskd.log
> -log=/var/log/taskd/taskd.log
>  pid.file=/var/run/taskd/taskd.pid
>  queue.size=10
>  request.limit=1048576
>  root=/var/taskd
> -server=*:53589
> +server=127.0.0.1:53589
> +trust=strict
>  verbose=1
>  client.cert=/var/taskd/client.cert.pem
>  client.key=/var/taskd/client.key.pem
> @@ -14,4 +14,3 @@ server.cert=/var/taskd/server.cert.pem
>  server.key=/var/taskd/server.key.pem
>  server.crl=/var/taskd/server.crl.pem
>  ca.cert=/var/taskd/ca.cert.pem
> -client.allow=^task [2-9]
> Index: files/vars.dist
> ===
> RCS file: files/vars.dist
> diff -N files/vars.dist
> --- files/vars.dist   12 Jul 2014 22:08:35 -  1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,9 +0,0 @@
> -#dnsnames="example.com example.net"
> -#ipaddrs="10.11.12.13 10.20.30.40"
> -bits=4096
> -expiration_days=365
> -organization="Göteborg Bit Factory"
> -cn="Göteborg Bit Factory"
> -country=SE
> -state="Västra Götaland"
> -locality="Göteborg"
> Index: patches/patch-CMakeLists_txt
> 

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/28 08:42:27

Modified files:
security/letsencrypt: Makefile.inc 
security/letsencrypt/client: distinfo 
security/letsencrypt/py-acme: distinfo 

Log message:
update to letsencrypt-0.3.0

NEW: sysutils/vifm

[Rafael Sadowski]

hey @ports and vifm friends,

here is an up-to-date vifm port. Tested on amd64 by me and positive test
feedback from Uwe Werler. Port request by Uwe.

I found a thread on ports@:
https://marc.info/?l=openbsd-ports=144944041505080=2

I can not confirm runtime problems or memory usage oversize at buildtime.

pkg/DESCR:
Vifm is a two panel ncurses based vi[m] like file manager. If you use vi,
vifm gives you complete keyboard control over your files without having
to learn a new set of commands. It goes not just about vi[m] like
keybindings, but also about modes, options, registers, commands and other
things you might already like in vi[m].

Best regards,

Rafael


vifm.tar.gz
Description: application/tar-gz

Re: [new] sysutils/borgbackup

[Daniel Jakots]

On Thu, 28 Jan 2016 00:38:42 -0500, Michael Reed 
wrote:

> I don't understand the purpose of the warning, let alone the best way
> to fix it, so if anyone could shed some light on that it'd be much
> appreciated.

$ make REVISION=999 plist
and then (just a sample) diff -up PLIST.orig PLIST:
-lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/borgbackup-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/

Otherwise looks fine.

Cheers,
Daniel

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/28 08:08:45

Modified files:
security/keychain: Makefile distinfo 
security/keychain/pkg: DESCR 
Removed files:
security/keychain/patches: patch-keychain 

Log message:
update to keychain-2.8.2, revise DESCR

Re: NEW: sysutils/duply

[viq]

On pon, 2016-01-18 at 22:31 +0100, viq wrote:
> On Sun, 2016-01-17 at 13:50 +0100, Adam Wolk wrote:
> > On Sat, 09 Jan 2016 23:36:25 +0100
> > viq  wrote:
> > 
> > > $ cat duply/pkg/DESCR 
> > > Duply is a shell front end for the duplicity backup tool.
> > > It greatly simplifies its usage by implementing backup
> > > job profiles, batch commands and more. Who says secure
> > > backups on non-trusted spaces are no child's play.
> > > 
> > > WWW: http://duply.net
> > > 
> > > I've been using it on other systems, now time to have it on
> > > OpenBSD
> > > as
> > > well ;) Works fine for me, though I really tested only with
> > > duplicity
> > > 0.7.x
> > > 
> > 
> > I'm not a duplicity user (yet?) but decided to at least test your
> > port
> > since you already pinged 2 times and seems no one noticed yet :)
> 
> Thank you :)
> 
> > > Should I patch
> > > #!/usr/bin/env bash
> > > to use absolute path, or is it OK to leave as is?
> > 
> > I think /usr/bin/env bash is completely fine. That's a proper
> > portable
> > way to find an interpreter.
> > 
> > Why is the port using the lang/python module? I don't see any build
> > systems or .egg files being produced here. Just being dependant on
> > sysutils/duplicity should get you the interpreter used by
> > duplicity.
> > The port itself is a bash program calling a python program - not a
> > python program.
> > 
> > In my opinion you can drop both:
> >  - MODULES =lang/python
> >  - SUBST_VARS +=MODPY_VERSION
> 
> Good catch. An earlier version was doing some python version
> detection,
> so I was putting python${MODPY_VERSION} in there, but the way it's
> currently there is no need for this. Removed.

Bump. I'm using this on a bunch of my machines to back up to hubic.

> > I tried the master site you mentioned in the Makefile, indeed it
> > doesn't
> > work with the spaces.
> > 
> > Tested the port on amd64 snapshot from Jan 15th. It builds and
> > installs
> > cleanly.
> 
> Thank you.

-- 
viq 

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/28 08:51:38

Modified files:
security/openssl: Makefile distinfo 
security/openssl/patches: patch-Configure 
security/openssl/pkg: PLIST 

Log message:
security update to openssl-1.0.2f
http://www.openssl.org/news/openssl-1.0.2-notes.html

CVS: cvs.openbsd.org: ports

[Kent R . Spillner]

CVSROOT:/cvs
Module name:ports
Changes by: kspill...@cvs.openbsd.org   2016/01/28 10:15:05

Modified files:
productivity/taskd: Makefile distinfo 
productivity/taskd/files: config 
productivity/taskd/patches: patch-pki_README 
patch-pki_generate_ca 
productivity/taskd/pkg: PLIST README taskd.rc 
Added files:
productivity/taskd/patches: patch-CMakeLists_txt 
patch-src_util_cpp patch-src_util_h 
Removed files:
productivity/taskd/files: vars.dist 
productivity/taskd/patches: patch-pki_generate 
patch-pki_generate_client 
patch-pki_generate_crl 
patch-pki_generate_server 

Log message:
Update to v1.1.0.

ok sthen@

Re: Vulnerable package in ports tree 29/01

[Michael McConville]

Sevan / Venture37 wrote:
> emulators/qemu -
> 
> https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-1779

Do you mean in the 5.7 or 5.8 release trees? This was patched in August.

Re: CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

> > Is it just me or is it weird that the package is named py-fabric?
> > Why not just "fabric"?
> 
> In addition to the standalone client, you can use fabric as a library
> in a python program. That is the reason why I didn't suggest the name
> change to the MAINTAINER.

Yeah but it's really known as "fabric".
We already made the same mistake with puppet (it used to be ruby-puppet).

> If you or others prefer sysutils/fabric, I'm not against the change.

The directory does not really matter, you can keep sysutils/py-fabric; it's the 
pkgname I think that should be changed.
But don't just listen to me, let's see if someone else can give some input ;-)

-- 
Antoine

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/01/29 00:39:34

Modified files:
sysutils/awscli: Makefile distinfo 
sysutils/awscli/pkg: PLIST 

Log message:
Update to awscli-1.10.1.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/01/29 00:39:16

Modified files:
net/py-botocore: Makefile distinfo 
net/py-botocore/pkg: PLIST 

Log message:
Update to py-botocore-1.3.23.

Vulnerable package in ports tree 29/01

[Sevan / Venture37]

emulators/qemu -
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-1779
devel/subversion -
http://subversion.apache.org/security/CVE-2015-5259-advisory.txt

Sevan / Venture37

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/01/28 09:33:35

Modified files:
sysutils/salt  : Makefile 

Log message:
Fix sed(1).

reported by nigel@

Re: NEW: py-Fabric

[Landry Breuil]

On Thu, Jan 28, 2016 at 07:18:55PM +0100, Juan Francisco Cantero Hurtado wrote:
> On Tue, Jan 19, 2016 at 12:25:47PM +0100, Pablo Méndez Hernández wrote:
> > $ cat sysutils/py-Fabric/pkg/DESCR
> > Fabric is a Python (2.5-2.7) library and command-line tool for streamlining 
> > the
> > use of SSH for application deployment or systems administration tasks.
> > 
> > It provides a basic suite of operations for executing local or remote shell
> > commands (normally or via sudo) and uploading/downloading files, as well as
> > auxiliary functionality such as prompting the running user for input, or
> > aborting execution.
> 
> I've attached an updated version of the port with changes from Pablo
> and me. The only missing part is one dependency for the tests (an
> outdated version of fudge).
> 
> I would like to import the port before of the cvs lock. Comments? OK?

Reads good, okay

[update] games/stone-soup

[Henrique N. Lengler]

Updated the game now that sdl2 is fixed. Looks like there is no more need to
keep some older patches. Lua is needed to build. Bison is not needed, only
optional, and some other changes.

I'm new on porting, so I'm doubt about how to properly set egcc to be used,
since even that new gcc is installed, the make wasn't using it. I did by setting
CC and CXX to egcc and eg++, if there is a better way of doing it please
correct.
Index: Makefile
===
RCS file: /cvs/ports/games/stone-soup/Makefile,v
retrieving revision 1.23
diff -u -p -u -r1.23 Makefile
--- Makefile4 Dec 2015 20:47:53 -   1.23
+++ Makefile28 Jan 2016 17:04:51 -
@@ -7,8 +7,8 @@ COMMENT =   dungeon crawl stone soup
 CATEGORIES =   games
 
 HOMEPAGE = http://crawl.develz.org/
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=crawl-ref/}
-VERSION =  0.15.2
+MASTER_SITES = http://crawl.develz.org/release/
+VERSION =  0.17.1
 DISTNAME=  stone_soup-${VERSION}-nodeps
 EXTRACT_SUFX=  .tar.xz
 PKGNAME=   stone-soup-${VERSION}
@@ -17,9 +17,12 @@ REVISION=0
 WRKDIST =  ${WRKDIR}/stone_soup-${VERSION}
 WRKSRC =   ${WRKDIST}/source
 USE_GMAKE =Yes
-CFLAGS +=  "-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL"
-CXXFLAGS +="-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL"
-MAKE_FLAGS =   CC="${CC}" CXX="${CXX}" \
+CFLAGS +=  "-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL2"
+CXXFLAGS +="-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL2"
+CC =   egcc
+CXX =  eg++
+MAKE_FLAGS =   CC="${CC}" CXX="${CXX}" HOSTCXX="${CXX}"\
+   NO_OPTIMIZE=y \
LUA_INCLUDE_DIR=${MODLUA_INCL_DIR} \
LUA_LIB=${MODLUA_LIB} \
SQLITE_INCLUDE_DIR=/usr/include \
@@ -27,9 +30,6 @@ MAKE_FLAGS =  CC="${CC}" CXX="${CXX}" \
INSTALL_UGRP=root:wheel \
prefix=${PREFIX} \
SAVEDIR="~/.crawl" \
-   PROPORTIONAL_FONT="${X11BASE}/lib/X11/fonts/TTF/DejaVuSans.ttf" 
\
-   
MONOSPACED_FONT="${X11BASE}/lib/X11/fonts/TTF/DejaVuSansMono.ttf" \
-   NO_YACC=1 \
V=1
 
 MAKE_ENV +=MODLUA_DEP_VERSION=${MODLUA_DEP_VERSION}
@@ -38,8 +38,8 @@ MODGCC4_LANGS = c++
 MODULES =  gcc4 lang/lua
 WANTLIB =  c m ${MODLUA_WANTLIB} sqlite3
 
-BUILD_DEPENDS = devel/bison \
-   graphics/pngcrush
+BUILD_DEPENDS = graphics/pngcrush \
+   lang/lua/5.1
 
 # Almost nethack...
 PERMIT_PACKAGE_FTP =   Yes
@@ -52,17 +52,14 @@ FLAVOR ?=
 WANTLIB += ncursesw pthread z
 MAKE_FLAGS +=  USE_UNICODE=y UNICODE_LOCALE=y
 .else
-# This should be automatically set during "gmake -C rltiles..." but isn't...
-CFLAGS +=  -DUSE_TILE
-CXXFLAGS +=-DUSE_TILE
-
 MAKE_FLAGS +=  TILES=y \
-   YACC=yacc \
-   LDFLAGS="-L${LOCALBASE}/lib -lSDL -lSDL_image -lpng -pthread"
-WANTLIB += GL GLU SDL SDL_image freetype png pthread z
-RUN_DEPENDS =  devel/desktop-file-utils
-LIB_DEPENDS += devel/sdl \
-   devel/sdl-image \
+   PROPORTIONAL_FONT="${X11BASE}/lib/X11/fonts/TTF/DejaVuSans.ttf" 
\
+   
MONOSPACED_FONT="${X11BASE}/lib/X11/fonts/TTF/DejaVuSansMono.ttf" \
+   LDFLAGS="-L${LOCALBASE}/lib -lpng -lSDL2 -lSDL2_image"
+
+WANTLIB += GL GLU SDL2 SDL2_image freetype png pthread z
+LIB_DEPENDS += devel/sdl2 \
+   devel/sdl2-image \
graphics/png
 .endif
 
@@ -70,7 +67,16 @@ post-install:
mv ${PREFIX}/bin/crawl ${PREFIX}/bin/crawl-ss
chmod 755 ${PREFIX}/bin/crawl-ss
${INSTALL_MAN} ${WRKDIST}/docs/crawl.6 ${PREFIX}/man/man6/crawl-ss.6
-   ${INSTALL_DATA} ${WRKDIST}/README.txt ${PREFIX}/share/crawl/docs
+# install docs manually
+   @mkdir -p ${PREFIX}/share/doc/crawl/
+   @mkdir -p ${PREFIX}/share/doc/crawl/develop/levels
+   @mkdir -p ${PREFIX}/share/doc/crawl/license
+   ${INSTALL_DATA} ${WRKDIST}/docs/quickstart.txt 
${PREFIX}/share/doc/crawl/quickstart.txt
+   ${INSTALL_DATA} ${WRKDIST}/docs/*.txt ${PREFIX}/share/doc/crawl/
+   ${INSTALL_DATA} ${WRKDIST}/docs/develop/*.txt 
${PREFIX}/share/doc/crawl/develop
+   ${INSTALL_DATA} ${WRKDIST}/docs/develop/levels/*.txt 
${PREFIX}/share/doc/crawl/develop/levels
+   ${INSTALL_DATA} ${WRKDIST}/docs/license/*.txt 
${PREFIX}/share/doc/crawl/license
+   ${INSTALL_DATA} ${WRKDIST}/CREDITS.txt ${PREFIX}/share/doc/crawl/
 .if ! ${FLAVOR:Mno_x11}
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps ${PREFIX}/share/applications
${INSTALL_DATA} \
Index: distinfo
===
RCS file: /cvs/ports/games/stone-soup/distinfo,v
retrieving revision 1.4
diff -u -p -u -r1.4 distinfo
--- distinfo7 Apr 2015 10:10:28 -   1.4
+++ distinfo28 Jan 2016 17:04:51 -
@@ -1,2 +1,2 @@
-SHA256 (stone_soup-0.15.2-nodeps.tar.xz) = 

Re: CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

On Thu, Jan 28, 2016 at 02:05:11PM -0700, Juan Francisco Cantero Hurtado wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   juan...@cvs.openbsd.org 2016/01/28 14:05:11
> 
> Log message:
> Import sysutils/py-fabric. OK landry@.

Is it just me or is it weird that the package is named py-fabric?
Why not just "fabric"?


-- 
Antoine

WANTLIB, HOMEPAGE: graphics/inkscape

[Rafael Sadowski]

Hi ports@,

fix/update WANTLIB and update https ready HOMEPAGE for inkscape.
I like inkscape but I fight with lot of crashes. I use inkscape from
packages and not from ports on my clean work machine.

So I think, the inkscape port needs more love ;)

Best regards,

Rafael

Index: Makefile
===
RCS file: /cvs/ports/graphics/inkscape/Makefile,v
retrieving revision 1.47
diff -u -p -u -p -r1.47 Makefile
--- Makefile29 Nov 2015 10:45:22 -  1.47
+++ Makefile28 Jan 2016 22:03:57 -
@@ -7,26 +7,24 @@ COMMENT=  SVG vector drawing application
 
 DISTNAME=  inkscape-0.91
 CATEGORIES=graphics
-REVISION=  5
+REVISION=  6
 
 MASTER_SITES = https://inkscape.org/en/gallery/item/3854/
-HOMEPAGE=  http://www.inkscape.org/
+HOMEPAGE=  https://inkscape.org/
 
 # GPLv2 and LGPLv2.1
 PERMIT_PACKAGE_CDROM=  Yes
 
-WANTLIB += ICE Magick++-6.Q16 MagickCore-6.Q16 MagickWand-6.Q16
-WANTLIB += SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender Xt aspell atk-1.0 atkmm-1.6 bz2 c cairo
-WANTLIB += cairomm-1.0 djvulibre enchant exif expat ffi fftw3
-WANTLIB += fontconfig freetype gc gdk-x11-2.0 gdk_pixbuf-2.0 gdkmm-2.4
-WANTLIB += gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0
-WANTLIB += graphite2 gsl gslcblas gthread-2.0 gtk-x11-2.0 gtkmm-2.4
-WANTLIB += gtkspell harfbuzz jbig jpeg lcms2 lzma m openjp2 openjpeg
-WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4 pcre
-WANTLIB += pixman-1 png poppler poppler-glib popt pthread pthread-stubs
-WANTLIB += sigc-2.0 stdc++ tiff webp xcb xcb-render xcb-shm xml2
-WANTLIB += xslt z
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender aspell atk-1.0 atkmm-1.6 c cairo cairomm-1.0
+WANTLIB += enchant exif expat ffi fontconfig freetype gc gdk-x11-2.0
+WANTLIB += gdk_pixbuf-2.0 gdkmm-2.4 gio-2.0 giomm-2.4 glib-2.0
+WANTLIB += glibmm-2.4 gmodule-2.0 gobject-2.0 graphite2 gsl gslcblas
+WANTLIB += gthread-2.0 gtk-x11-2.0 gtkmm-2.4 gtkspell harfbuzz
+WANTLIB += jpeg lcms2 lzma m openjpeg pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pangomm-1.4 pcre pixman-1 png poppler
+WANTLIB += poppler-glib popt pthread pthread-stubs sigc-2.0 stdc++
+WANTLIB += tiff xcb xcb-render xcb-shm xml2 xslt z
 
 MODULES=   devel/gettext \
textproc/intltool \

Adding pledge() to www/lynx

[Frederic Cambus]

Hi ports@,

This diff adds support for pledge() to the current Lynx version.

Needs 'cpath', 'rpath', 'wpath' for reading/saving configuration and 
bookmarks, and to save downloaded files.

Needs 'proc' and 'exec' for mailing printed files and spawning shell.

The other promises are obvious.

Index: Makefile
===
RCS file: /cvs/ports/www/lynx/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile14 Jan 2016 10:45:07 -  1.22
+++ Makefile28 Jan 2016 22:32:56 -
@@ -5,7 +5,7 @@ PL =8
 COMMENT =  text web browser
 DISTNAME = lynx${V}dev.${PL}
 PKGNAME =  lynx-${V}pl${PL}
-REVISION = 1
+REVISION = 2
 EXTRACT_SUFX = .tar.bz2
 CATEGORIES =   www net
 
@@ -16,6 +16,7 @@ MAINTAINER =  Frederic Cambus 

Re: [NEW] news/multimail

[Frederic Cambus]

> Thanks for testing once again :-) Indeed, there was a remaining build
> warning, added a new patch to address this, it has been fixed by
> upstream already.
>
> While I was at it, I pledged the port. I'm glad I did, because testing
> for all use cases made me realize I forgot to add a run dependency.
>
> Also fixed the man page name dilemna by renaming the target man page to
> multimail.1, which matches the package name and point to the right
> binary name.

Updated tarball attached which adds a missing '# uses pledge()' marker.


multimail.tar.gz
Description: GNU Zip compressed data

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/28 15:50:59

Modified files:
security/openssl: Makefile 
Added files:
security/openssl/patches: patch-crypto_bio_bio_h 

Log message:
cherrypick patch from OpenSSL_1_0_2-stable upstream:
Correct number of arguments in BIO_get_conn_int_port macro.

Re: WANTLIB, HOMEPAGE: graphics/inkscape

[Stuart Henderson]

On 2016/01/28 23:12, Rafael Sadowski wrote:
> Hi ports@,
> 
> fix/update WANTLIB and update https ready HOMEPAGE for inkscape.

NAK - WANTLIB is already correct for -current. We could change
HOMEPAGE but I don't see much point in changing just that since
the existing one is not invalid..

> I like inkscape but I fight with lot of crashes. I use inkscape from
> packages and not from ports on my clean work machine.
> 
> So I think, the inkscape port needs more love ;)

Yes, I suspect it may be suffering from memory problems made more
obvious when malloc changed to junking the start of freed pages by
default.

I bet some of these will show on an ASAN build on Linux too.

Re: openbsd-wip is full!

[Chris Bennett]

Done.

CVS: cvs.openbsd.org: ports

[Juan Francisco Cantero Hurtado]

CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2016/01/28 14:05:11

Log message:
Import sysutils/py-fabric. OK landry@.

Comment:
simple, pythonic tool for remote execution and deployment

Description:
Fabric is a Python library and command-line tool for streamlining the
use of SSH for application deployment or systems administration tasks.

It provides a basic suite of operations for executing local or remote shell
commands (normally or via sudo) and uploading/downloading files, as well as
auxiliary functionality such as prompting the running user for input, or
aborting execution.

Maintainer: Pablo Mendez Hernandez 

WWW: http://www.fabfile.org/

Status:

Vendor Tag: juanfra
Release Tags:   juanfra_20160128

N ports/sysutils/py-fabric/Makefile
N ports/sysutils/py-fabric/distinfo
N ports/sysutils/py-fabric/pkg/DESCR
N ports/sysutils/py-fabric/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Juan Francisco Cantero Hurtado]

CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2016/01/28 14:09:47

Modified files:
sysutils   : Makefile 

Log message:
+py-fabric

Re: [new] sysutils/borgbackup

[Michael Reed]

On 01/28/16 13:27, Daniel Jakots wrote:
> On Thu, 28 Jan 2016 18:22:19 +0100, Daniel Jakots
>  wrote:
> 
>> Otherwise looks fine.
> 
> Well, you should add some TEST_DEPENDS [1] and maybe a test target.
> 
> [1]: 
> https://github.com/borgbackup/borg/blob/master/requirements.d/development.txt
> 

Thanks for the advice, I've attached a new version that passes portcheck.

I'll look into adding a test target later.


borgbackup.tgz
Description: Binary data

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2016/01/28 14:36:00

Modified files:
www/chromium   : Makefile distinfo 

Log message:
update to 48.0.2564.97

Re: CVS: cvs.openbsd.org: ports

[Juan Francisco Cantero Hurtado]

On Fri, Jan 29, 2016 at 12:22:08AM +0100, Antoine Jacoutot wrote:
> On Thu, Jan 28, 2016 at 02:05:11PM -0700, Juan Francisco Cantero Hurtado 
> wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: juan...@cvs.openbsd.org 2016/01/28 14:05:11
> > 
> > Log message:
> > Import sysutils/py-fabric. OK landry@.
> 
> Is it just me or is it weird that the package is named py-fabric?
> Why not just "fabric"?

In addition to the standalone client, you can use fabric as a library
in a python program. That is the reason why I didn't suggest the name
change to the MAINTAINER.

If you or others prefer sysutils/fabric, I'm not against the change.

-- 
Juan Francisco Cantero Hurtado http://juanfra.info

Re: NEW: math/gunits

[Martijn van Duren]

Port looks clean, builds and runs.

So just my 50 cent: OK

On 01/28/16 01:14, Stuart Henderson wrote:

Someone showed me that the gnu version of units(1) can handle bandwidth
calculations which I've been doing by hand before because I couldn't
figure out how to get the one in base to do something other than
"conformability error" for these. Looking at the summary it seems
it has a bunch of other conversions too.

OK to add it as a port?


GNU Units converts quantities expressed in various systems of
measurement to their equivalents in other systems of measurement. Like
many similar programs, it can handle multiplicative scale changes. It
can also handle nonlinear conversions such as Fahrenheit to Celsius
or wire gauge, and it can convert from and to sums of units, such as
converting between meters and feet plus inches.


example:

$ gunits
Currency exchange rates from www.timegenie.com on 2015-10-14
2919 units, 109 prefixes, 88 nonlinear units

You have: 30Mbit/s * 1 month
You want: TB
* 9.8615394
/ 0.10140405

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/01/28 01:32:46

Modified files:
devel/libev: Makefile 

Log message:
Unbreak on arm by using "CFLAGS += -DEV_NO_SMP".

Thanks Andre Smagin for hints

"Almost all the armv7 systems are multicore but we don't run
multiprocessor on them. So the -DEV_NO_SMP approach sounds reasonable
for now" jsg@

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/01/28 01:40:47

Modified files:
devel/libffi   : Makefile 
devel/libffi/patches: patch-libffi_pc_in 
Added files:
devel/libffi/patches: patch-configure 

Log message:
Always link with -pthread for libffi, it depends on libpthread but didn't
propagate it.

originally spotted by Karel Gardas via jca@
tested in a bulk by and OK aja@

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/01/28 01:41:39

Modified files:
lang/gforth: Makefile 

Log message:
remove 'XXX' now that libffi has been fixed

Re: CVS: cvs.openbsd.org: ports

[David Coppa]

Il 27/gen/2016 19:22, "Landry Breuil"  ha scritto:

> Note that starting with fx 45, gstreamer will be deprecated in favor of
> ffmpeg. If it works, haven't tested it yet

\o/ \o/ decent video support for firefox!

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/01/28 02:22:31

Modified files:
devel/cmake: Makefile cmake.port.mk 
devel/cmake/patches: patch-bootstrap 
Removed files:
devel/cmake/patches: patch-Source_CMakeLists_txt 

Log message:
Use g++-4.9 from ports to build cmake on arm

OK jsg@, sthen@

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/28 05:27:21

Modified files:
www/chromium   : Makefile 
www/iridium: Makefile 

Log message:
prebuild a missing dep that I ran into with chromium on a bulk build; ok robert@

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/28 05:29:54

Modified files:
devel/log4cplus: Makefile distinfo 
devel/log4cplus/pkg: PLIST 
Removed files:
devel/log4cplus/patches: patch-src_Makefile_in 

Log message:
update to log4cplus-1.2.0, switch to cmake build

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2016/01/28 05:11:49

Modified files:
www/nginx  : Tag: OPENBSD_5_8 Makefile distinfo 

Log message:
apply fixes from nginx's repository for the following
vulnerabilities:
CVE-2016-0742, CVE-2016-0746, CVE-2016-0747

ok jasper@

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/28 06:30:02

Modified files:
x11/xfm/patches: patch-Imakefile patch-lib_Apps 
 patch-lib_Xfm_cpp patch-src_FmBitmaps_c 
 patch-src_FmChmod_c patch-src_FmFw_c 
 patch-src_FmHistory_c patch-src_FmLog_c 
 patch-src_FmMain_c patch-src_FmSelection_c 
 patch-src_TextField_c 

Log message:
regen patches

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2016/01/28 03:21:21

Modified files:
sysutils/tarsnap-gui: Makefile distinfo 

Log message:
Update to tarsnap-gui-0.8.

from Josh Grosse (maintainer)

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/28 03:31:15

Log message:
import math/gunits, it handles some things that units(1) doesn't. ok 
martijn@

GNU Units converts quantities expressed in various systems of
measurement to their equivalents in other systems of measurement. Like
many similar programs, it can handle multiplicative scale changes. It
can also handle nonlinear conversions such as Fahrenheit to Celsius
or wire gauge, and it can convert from and to sums of units, such as
converting between meters and feet plus inches.

Status:

Vendor Tag: sthen
Release Tags:   sthen_20160128

N ports/math/gunits/Makefile
N ports/math/gunits/distinfo
N ports/math/gunits/pkg/PLIST
N ports/math/gunits/pkg/DESCR

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/01/28 03:31:40

Modified files:
math   : Makefile 

Log message:
+gunits

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/01/28 04:33:52

Modified files:
www/webkitgtk4 : Makefile distinfo 

Log message:
Update to webkitgtk4-2.10.6.

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/01/28 04:28:02

Modified files:
devel/cmake: Makefile cmake.port.mk 
devel/cmake/patches: patch-CMakeLists_txt 
Added files:
devel/cmake/patches: patch-Source_CMakeLists_txt 

Log message:
Do not handle jsoncpp in a special way, treat it like all the other
external libraries

$ diff -u objdump-pre.out objdump-post.out | grep libjsoncpp
-  NEEDED  /usr/local/lib/libjsoncpp.so.0.0
+  NEEDED  libjsoncpp.so.0.0

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2016/01/28 02:58:29

Modified files:
devel/p5-Test-URI: Makefile distinfo 
devel/p5-Test-URI/pkg: PLIST 

Log message:
Update to p5-Test-URI-1.081.

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/01/28 02:45:47

Modified files:
databases/redis: Makefile distinfo 
databases/redis/patches: patch-src_Makefile 

Log message:
Bugfixing update to redis-3.0.7

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

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

Modified files:
games/wtf  : Makefile distinfo 

Log message:
Update to wtf-20160122.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/01/28 11:17:11

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

Log message:
update to vte3-0.42.3

Re: CVS: cvs.openbsd.org: ports

[Kent R. Spillner]

On Thu, Jan 28, 2016 at 10:15:05AM -0700, Kent R. Spillner wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   kspill...@cvs.openbsd.org   2016/01/28 10:15:05
> 
> Modified files:
>   productivity/taskd: Makefile distinfo 
>   productivity/taskd/files: config 
>   productivity/taskd/patches: patch-pki_README 
>   patch-pki_generate_ca 
>   productivity/taskd/pkg: PLIST README taskd.rc 
> Added files:
>   productivity/taskd/patches: patch-CMakeLists_txt 
>   patch-src_util_cpp patch-src_util_h 
> Removed files:
>   productivity/taskd/files: vars.dist 
>   productivity/taskd/patches: patch-pki_generate 
>   patch-pki_generate_client 
>   patch-pki_generate_crl 
>   patch-pki_generate_server 
> 
> Log message:
> Update to v1.1.0.
> 
> ok sthen@

And take MAINTAINER.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/01/28 11:14:54

Modified files:
lang/gforth/patches: patch-arch_mips_machine_h 
 patch-engine_engine_c 

Log message:
- sync engine.c with what's been committed upstream
- a variation of machine.h is committed upstream, well prepared for 
openbsd/mips32

no pkg change

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/01/28 11:23:27

Modified files:
lang/gforth/patches: patch-configure patch-libffi_fs 
Removed files:
lang/gforth/patches: patch-Makefile_in 

Log message:
- remove unneeded patch
- annotate what had been committed upstream before

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2016/01/28 11:28:30

Modified files:
devel/xulrunner/24: Makefile 

Log message:
Readd kvm to WANTLIB, bump REVISIONs, because xulrunner.
reported by nigel@, thanks!

Re: NEW: py-Fabric

[Juan Francisco Cantero Hurtado]

On Tue, Jan 19, 2016 at 12:25:47PM +0100, Pablo Méndez Hernández wrote:
> $ cat sysutils/py-Fabric/pkg/DESCR
> Fabric is a Python (2.5-2.7) library and command-line tool for streamlining 
> the
> use of SSH for application deployment or systems administration tasks.
> 
> It provides a basic suite of operations for executing local or remote shell
> commands (normally or via sudo) and uploading/downloading files, as well as
> auxiliary functionality such as prompting the running user for input, or
> aborting execution.

I've attached an updated version of the port with changes from Pablo
and me. The only missing part is one dependency for the tests (an
outdated version of fudge).

I would like to import the port before of the cvs lock. Comments? OK?

-- 
Juan Francisco Cantero Hurtado http://juanfra.info


py-fabric.tgz
Description: GNU Unix tar archive

Re: [new] sysutils/borgbackup

[Daniel Jakots]

On Thu, 28 Jan 2016 18:22:19 +0100, Daniel Jakots
 wrote:

> Otherwise looks fine.

Well, you should add some TEST_DEPENDS [1] and maybe a test target.

[1]: 
https://github.com/borgbackup/borg/blob/master/requirements.d/development.txt

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2016/01/28 11:34:08

Modified files:
lang/gforth: Makefile 
Removed files:
lang/gforth/patches: patch-envos_fs_in 

Log message:
use sed -i

Re: Adding pledge() to www/lynx

[Daniel Dickman]

On Thu, Jan 28, 2016 at 12:51 PM, Frederic Cambus  wrote:
> Hi ports@,
>
> This diff adds support for pledge() to the current Lynx version.
>
> +
> ++if (pledge("stdio tty cpath rpath wpath dns inet proc exec", NULL) == 
> -1) {
> ++  err(EXIT_FAILURE, "pledge");
> ++}
> ++

i have ioctl in my local patch. is it not needed?

is it possible to get rid of proc exec? I didn't add them on my end...

Re: net/prosody 0.9.10 (security)

[Henrik Friedrichsen]

Hey,

Thanks for the patch. Can't look into it now, but another change in the
pre-configure was committed with the security fix, maybe that'll fix the
tests.

In either case, I'll look into it tomorrow at latest.

On Thu, Jan 28, 2016 at 08:00:49AM +0100, Mark Patruck wrote:
> Also, the /dev/urandom read-only patch is not needed anymore,
> as fixed upstream. Builds and runs fine, though tests fail. Last
> working version is 0.9.8. Will look into this...

Henrik

Re: Adding pledge() to www/lynx

[Daniel Dickman]

On Thu, Jan 28, 2016 at 10:11 PM, Daniel Dickman  wrote:
> On Thu, Jan 28, 2016 at 12:51 PM, Frederic Cambus  wrote:
>> Hi ports@,
>>
>> This diff adds support for pledge() to the current Lynx version.
>>
>> +
>> ++if (pledge("stdio tty cpath rpath wpath dns inet proc exec", NULL) == 
>> -1) {
>> ++  err(EXIT_FAILURE, "pledge");
>> ++}
>> ++
>
> i have ioctl in my local patch. is it not needed?
>
> is it possible to get rid of proc exec? I didn't add them on my end...


Also should it call "err" or "exit_immediately" on failure?

Re: Adding pledge() to www/lynx

[Theo Buehler]

On Thu, Jan 28, 2016 at 10:15:53PM -0500, Daniel Dickman wrote:
> On Thu, Jan 28, 2016 at 10:11 PM, Daniel Dickman  wrote:
> > On Thu, Jan 28, 2016 at 12:51 PM, Frederic Cambus  wrote:
> >> Hi ports@,
> >>
> >> This diff adds support for pledge() to the current Lynx version.
> >>
> >> +
> >> ++if (pledge("stdio tty cpath rpath wpath dns inet proc exec", NULL) 
> >> == -1) {
> >> ++  err(EXIT_FAILURE, "pledge");
> >> ++}
> >> ++
> >
> > i have ioctl in my local patch. is it not needed?

probably not.  a quick grep only shows TIOCGWINSZ (which needs pledge
"tty") and FIONBIO ioctl calls.  pledge ioctl in interactive programs is
usually a hint that "tty" was forgotten in earlier attempts with too
tight pledges.

> > is it possible to get rid of proc exec? I didn't add them on my end...

there are shell escapes, so they are probably needed.  I don't really
use lynx myself, but it seems to me that it's worth investigating
tighter pledges conditionally on various "lynx -restriction=..."
options (hopefully those can't be changed at runtime).

> Also should it call "err" or "exit_immediately" on failure?

I agree that the latter looks like the right way to go.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/01/28 06:41:39

Modified files:
x11/gtk+3  : Makefile distinfo 
x11/gtk+3/pkg  : PLIST-main 

Log message:
Update to gtk+3-3.18.7.

UPDATE: Xaw3d, graphics/xfig, print/gv. REMOVE: x11/xfm

[Stuart Henderson]

It's difficult to separate these as old versions don't build with
new Xaw3d, with these diffs everything that builds against Xaw3d
still builds and runs OK with one exception: x11/xfm. There is a
patch in pkgsrc for that, but it segfaults at startup - since it
doesn't really seem all that useful any more I propose to remove it.

Any xfig/gv power users wanting to test?

(Note that I've added a crash-at-window-close fix for xfig which
affects the in-tree version too).

Any OKs/objections?

Index: x11/Xaw3d/Makefile
===
RCS file: /cvs/ports/x11/Xaw3d/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- x11/Xaw3d/Makefile  16 Mar 2015 18:07:58 -  1.31
+++ x11/Xaw3d/Makefile  28 Jan 2016 13:56:11 -
@@ -2,31 +2,23 @@
 
 COMMENT=   3D Athena Widget set that looks like Motif
 
-DISTNAME=  Xaw3d-1.5
-REVISION=  3
-SHARED_LIBS=   Xaw3d 11.0
+PKGNAME=   Xaw3d-1.6.2
+DISTNAME=  lib${PKGNAME}
+
+SHARED_LIBS += Xaw3d12.0 # 8.0
+
 CATEGORIES=x11
 
-MASTER_SITES=  ${MASTER_SITE_XCONTRIB:=widgets/Xaw3d/R6.3/}
+MASTER_SITES=  http://xorg.freedesktop.org/archive/individual/lib/
 
 # X11/badly worded
 PERMIT_PACKAGE_CDROM=  Yes
-WANTLIB=   ICE SM X11 Xext Xmu Xpm Xt Xau Xdmcp
-
 
-CONFIGURE_STYLE=imake
-MAKE_FLAGS=SOXAWREV=${LIBXaw3d_VERSION}
+WANTLIB += ICE SM X11 Xext Xmu Xt xcb
 
-WRKDIST=   ${WRKDIR}/xc/lib/Xaw3d
-
-post-extract:
-   @mkdir -p ${WRKSRC}/X11/Xaw3d
-   @cd ${WRKSRC}/X11/Xaw3d; ln -sf ../../*.h .
+CONFIGURE_STYLE= gnu
+#CONFIGURE_ARGS=   --enable-arrow-scrollbars
 
 NO_TEST=   Yes
-
-post-install:
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Xaw3d
-   ${INSTALL_DATA} ${WRKSRC}/README.XAW3D ${PREFIX}/share/doc/Xaw3d
 
 .include 
Index: x11/Xaw3d/distinfo
===
RCS file: /cvs/ports/x11/Xaw3d/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- x11/Xaw3d/distinfo  18 Jan 2015 03:15:51 -  1.4
+++ x11/Xaw3d/distinfo  28 Jan 2016 13:56:11 -
@@ -1,2 +1,2 @@
-SHA256 (Xaw3d-1.5.tar.gz) = QYZsSSb213x+1fh3bBwCzQYNWTgwESsorU5dQ8FD3wg=
-SIZE (Xaw3d-1.5.tar.gz) = 284420
+SHA256 (libXaw3d-1.6.2.tar.gz) = hH2rAa6sFEiRbjtO20QlWUs6wollYtnHFBqkrGyJi6k=
+SIZE (libXaw3d-1.6.2.tar.gz) = 672986
Index: x11/Xaw3d/patches/patch-Imakefile
===
RCS file: x11/Xaw3d/patches/patch-Imakefile
diff -N x11/Xaw3d/patches/patch-Imakefile
--- x11/Xaw3d/patches/patch-Imakefile   31 Dec 2005 17:29:38 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-Imakefile,v 1.2 2005/12/31 17:29:38 naddy Exp $
 Imakefile.orig Tue Oct 15 16:41:19 1996
-+++ Imakefile  Sat Dec 31 16:32:15 2005
-@@ -39,9 +39,9 @@ DEFINES = XawI18nDefines
- 
-LINTLIBS = $(LINTXLIB) $(LINTXTOOL)
- 
--#  EXTRA_DEFINES = -DARROW_SCROLLBAR -DUSEGRAY
-+EXTRA_DEFINES = -DARROW_SCROLLBAR -DUSEGRAY
- 
--#  EXTRA_INCLUDES = -I.
-+EXTRA_INCLUDES = -I.
- 
- HEADERS = \
-   AllWidgets.h \
Index: x11/Xaw3d/patches/patch-XawI18n_h
===
RCS file: x11/Xaw3d/patches/patch-XawI18n_h
diff -N x11/Xaw3d/patches/patch-XawI18n_h
--- x11/Xaw3d/patches/patch-XawI18n_h   3 Nov 2004 23:46:11 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-XawI18n_h,v 1.1 2004/11/03 23:46:11 naddy Exp $
 XawI18n.h.orig Thu Nov  4 00:32:53 2004
-+++ XawI18n.h  Thu Nov  4 00:33:46 2004
-@@ -29,10 +29,12 @@ in this Software without prior written a
- 
- #ifdef HAS_WCTYPE_H
- #include 
-+#ifndef NO_WIDEC_H
- #include 
- #define wcslen(c) wslen(c)
- #define wcscpy(d,s) wscpy(d,s)
- #define wcsncpy(d,s,l) wsncpy(d,s,l)
-+#endif
- #endif
- 
- #ifdef HAS_WCHAR_H
Index: x11/Xaw3d/pkg/PLIST
===
RCS file: /cvs/ports/x11/Xaw3d/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- x11/Xaw3d/pkg/PLIST 16 Mar 2015 18:07:58 -  1.8
+++ x11/Xaw3d/pkg/PLIST 28 Jan 2016 13:56:11 -
@@ -55,9 +55,6 @@ include/X11/Xaw3d/SmeThreeD.h
 include/X11/Xaw3d/SmeThreeDP.h
 include/X11/Xaw3d/StripCharP.h
 include/X11/Xaw3d/StripChart.h
-include/X11/Xaw3d/Template.c
-include/X11/Xaw3d/Template.h
-include/X11/Xaw3d/TemplateP.h
 include/X11/Xaw3d/Text.h
 include/X11/Xaw3d/TextP.h
 include/X11/Xaw3d/TextSink.h
@@ -66,6 +63,8 @@ include/X11/Xaw3d/TextSrc.h
 include/X11/Xaw3d/TextSrcP.h
 include/X11/Xaw3d/ThreeD.h
 include/X11/Xaw3d/ThreeDP.h
+include/X11/Xaw3d/Tip.h
+include/X11/Xaw3d/TipP.h
 include/X11/Xaw3d/Toggle.h
 include/X11/Xaw3d/ToggleP.h
 include/X11/Xaw3d/Tree.h
@@ -73,9 +72,12 @@ include/X11/Xaw3d/TreeP.h
 include/X11/Xaw3d/VendorEP.h
 include/X11/Xaw3d/Viewport.h
 include/X11/Xaw3d/ViewportP.h
+include/X11/Xaw3d/Xaw3dP.h
 include/X11/Xaw3d/XawImP.h
 

CVS: cvs.openbsd.org: ports

[Kirill Bychkov]

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2016/01/28 07:00:07

Modified files:
games/numptyphysics: Makefile 
games/numptyphysics/patches: patch-Path_cpp 
games/numptyphysics/pkg: DESCR-main 

Log message:
- remove trailing whitespaces
- add rcs id to patch

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2016/01/28 07:41:19

Modified files:
www/nginx  : Tag: OPENBSD_5_7 Makefile distinfo 

Log message:
add upstream patches for the following vulnerabilities:
CVE-2016-0742, CVE-2016-0746, CVE-2016-0747

ok jasper@

CVS: cvs.openbsd.org: ports

[Kirill Bychkov]

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2016/01/28 08:02:18

Modified files:
net/seafile: Makefile.inc 
net/seafile/ccnet: distinfo 
net/seafile/client: distinfo 
net/seafile/client/patches: patch-src_seafile-applet_cpp 
net/seafile/seafile: distinfo 

Log message:
update to seafile-5.0.4

Re: WANTLIB, HOMEPAGE: graphics/inkscape

[Nigel Taylor]

The WANTLIB shouldn't require changes

$ check-lib-depends -d . inkscape-0.91p5.tgz
Scanning: ok

$ ls -lrt ink*
-rw-r--r--  3 30013396 Jan 28 22:05 inkscape-0.91p5.tgz

That was built today with current.

It suggests there is something wrong with your building methods. You
seems to have lost ImageMagick

>From dpb log file

Configuration:

Source code location: .
Destination path prefix:  /usr/local
Compiler: c++
CPPFLAGS: -DG_DISABLE_DEPRECATED
-DGLIBMM_DISABLE_DEPRECATED -DGDKMM_DISABLE_DEPRECATED
-DGTK_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_DEPRECATED
-DGTKMM_DISABLE_DEPRECATED -Werror=format-security -Wswitch
-Werror=return-type -DGSEAL_ENABLE -DG_DISABLE_SINGLE_INCLUDES -Wall
-Wformat -Wformat-security -W -D_FORTIFY_SOURCE=2
-I/usr/local/include/ImageMagick  -I/usr/local/include -I/usr/X11R6/include
CXXFLAGS: -Wpointer-arith -Wcast-align
-Wsign-compare -Woverloaded-virtual -Wswitch -Wno-unused-parameter -O2
-pipe -std=c++11
CFLAGS:   -Wno-pointer-sign -O2 -pipe
LDFLAGS:  -Wl,-z,relro -L/usr/local/lib
-L/usr/X11R6/lib

Use gnome-vfs:no
Use openoffice files: yes
Use relocation support:   no
Enable LittleCms: yes
Enable DBUS:  no
Enable Poppler-Cairo: yes
ImageMagick Magick++: yes
Libwpg:   no
Libvisio: no
Libcdr:   no
Doing Local Install:  no
...
-lfreetype -lz -lsigc-2.0 -lz -lpopt -laspell -L/usr/local/lib -lexif
-L/usr/X11R6/lib -lfreetype -lz -L/usr/local/lib
-L/usr/X11R6/lib -lMagick++-6.Q16 -lMagickWand-6.Q16 -lMagickCore-6.Q16
-L/usr/X11R6/lib -lX11 -ljpeg  -L/usr/loca
l/lib -llcms2 -L/usr/local/lib -lpoppler -L/usr/local/lib
-Wl,-rpath-link,/usr/X11R6/lib -lpoppler-glib -lgio-2.0 -lgobject-2.0
-lglib-2.0 -lintl -lcairo
..


If for any reason pkg_delete ImageMagick is run the autoconfig will
(should) not detect it and your see a no in the above.

If building without ImageMagick you would have to change the LIB_DEPENDS
also and CONFIGURE_

You would also have to find a means of disabling ImageMagick, if it is
built when ImageMagick was present, there might be an appropriate config
argument.

Either way this has to be wrong apart from the home page change which I
haven't checked.



On 01/28/16 22:12, Rafael Sadowski wrote:
> Hi ports@,
> 
> fix/update WANTLIB and update https ready HOMEPAGE for inkscape.
> I like inkscape but I fight with lot of crashes. I use inkscape from
> packages and not from ports on my clean work machine.
> 
> So I think, the inkscape port needs more love ;)
> 
> Best regards,
> 
> Rafael
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/inkscape/Makefile,v
> retrieving revision 1.47
> diff -u -p -u -p -r1.47 Makefile
> --- Makefile  29 Nov 2015 10:45:22 -  1.47
> +++ Makefile  28 Jan 2016 22:03:57 -
> @@ -7,26 +7,24 @@ COMMENT=SVG vector drawing application
>  
>  DISTNAME=inkscape-0.91
>  CATEGORIES=  graphics
> -REVISION=5
> +REVISION=6
>  
>  MASTER_SITES =   https://inkscape.org/en/gallery/item/3854/
> -HOMEPAGE=http://www.inkscape.org/
> +HOMEPAGE=https://inkscape.org/
>  
>  # GPLv2 and LGPLv2.1
>  PERMIT_PACKAGE_CDROM=Yes
>  
> -WANTLIB += ICE Magick++-6.Q16 MagickCore-6.Q16 MagickWand-6.Q16
> -WANTLIB += SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
> -WANTLIB += Xrandr Xrender Xt aspell atk-1.0 atkmm-1.6 bz2 c cairo
> -WANTLIB += cairomm-1.0 djvulibre enchant exif expat ffi fftw3
> -WANTLIB += fontconfig freetype gc gdk-x11-2.0 gdk_pixbuf-2.0 gdkmm-2.4
> -WANTLIB += gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0
> -WANTLIB += graphite2 gsl gslcblas gthread-2.0 gtk-x11-2.0 gtkmm-2.4
> -WANTLIB += gtkspell harfbuzz jbig jpeg lcms2 lzma m openjp2 openjpeg
> -WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4 pcre
> -WANTLIB += pixman-1 png poppler poppler-glib popt pthread pthread-stubs
> -WANTLIB += sigc-2.0 stdc++ tiff webp xcb xcb-render xcb-shm xml2
> -WANTLIB += xslt z
> +WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
> +WANTLIB += Xrandr Xrender aspell atk-1.0 atkmm-1.6 c cairo cairomm-1.0
> +WANTLIB += enchant exif expat ffi fontconfig freetype gc gdk-x11-2.0
> +WANTLIB += gdk_pixbuf-2.0 gdkmm-2.4 gio-2.0 giomm-2.4 glib-2.0
> +WANTLIB += glibmm-2.4 gmodule-2.0 gobject-2.0 graphite2 gsl gslcblas
> +WANTLIB += gthread-2.0 gtk-x11-2.0 gtkmm-2.4 gtkspell harfbuzz
> +WANTLIB += jpeg lcms2 lzma m openjpeg pango-1.0 pangocairo-1.0
> +WANTLIB += pangoft2-1.0 pangomm-1.4 pcre pixman-1 png poppler
> +WANTLIB += poppler-glib popt pthread pthread-stubs sigc-2.0 stdc++
> +WANTLIB += tiff xcb xcb-render xcb-shm xml2 xslt z
>  
>  MODULES= devel/gettext \