CVS: cvs.openbsd.org: ports

[James Turner]

CVSROOT:/cvs
Module name:ports
Changes by: jtur...@cvs.openbsd.org 2016/10/18 19:46:15

Modified files:
www/kcgi   : Makefile distinfo 
www/kcgi/pkg   : PLIST 

Log message:
Update kcgi to 0.9.1

Now required GNU make for portability and introduces a new kutil_log(3)
interface.

CVS: cvs.openbsd.org: ports

[Visa Hankala]

CVSROOT:/cvs
Module name:ports
Changes by: v...@cvs.openbsd.org2016/10/18 19:07:32

Modified files:
lang/gcc/4.9   : Makefile distinfo 

Log message:
regen mips64 adastrap

ok pascal@

Re: UPDATE: benchmarks/netpipe

[Rafael Sadowski]

On Mon Oct 17, 2016 at 11:12:01PM +0200, Jeremie Courreges-Anglas wrote:
> Rafael Sadowski  writes:
> 
> > Hi ports@,
> >
> > simple update to the last stable release (found by unreachable
> > homepage).
> >
> > - HOMEPAGE / MASTER_SITES update
> > - cleanup
> > - remove unnecessary patch
> >
> > OK? Comments?
> 
> Here's an updated diff.
> - fix PKGNAME (duplicated DISTNAME lines)
> - unneeded EXTRACT_SUFX & WRKSRC
> - -DHAVE_GETRUSAGE now useless in CFLAGS
> - use MAKE_FILE instead of renameing makefile
> - also build and install the IPv6 version

Great! I add GPLv2 as licence-tag.

> 
> Sadly NPtcp now shows erratic behavior, most of the time the client
> doesn't get a proper handshake from the server.  Tested with NPtcp -r
> and NPtcp -h 127.0.0.1.
> 

My test-case works as described in netpipe(1):

$SHELL1: doas NPtcp
$SHELL2: doas NPtcp -h 127.0.0.1

Output from $SHELL2:
Send and receive buffers are 16384 and 16384 bytes
(A bug in Linux doubles the requested buffer sizes)
Now starting the main loop
0:   1 bytes   3452 times -->  0.32 Mbps in  23.69 usec
1:   2 bytes   4221 times -->  0.66 Mbps in  23.15 usec
2:   3 bytes   4319 times -->  0.98 Mbps in  23.34 usec
3:   4 bytes   2855 times -->  1.28 Mbps in  23.85 usec


Index: Makefile
===
RCS file: /cvs/ports/benchmarks/netpipe/Makefile,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 Makefile
--- Makefile22 Jan 2015 17:47:50 -  1.27
+++ Makefile18 Oct 2016 21:09:47 -
@@ -2,26 +2,30 @@
 
 COMMENT=   self-scaling network benchmark
 
-DISTNAME=  netpipe-2.4
-DISTFILES= NetPIPE_2.4.tar.gz
-REVISION=  0
+DISTNAME=  NetPIPE-3.7.2
+PKGNAME=   netpipe-3.7.2
 CATEGORIES=benchmarks net
 
-HOMEPAGE=  http://www.scl.ameslab.gov/netpipe/
+HOMEPAGE=  http://bitspjoule.org/netpipe/
 
+# GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 WANTLIB=   c
 
 MASTER_SITES=  ${HOMEPAGE}/code/
 
-MAKE_FLAGS=CC="${CC}" CFLAGS="${CFLAGS} -DHAVE_GETRUSAGE"
-ALL_TARGET=NPtcp
+MAKE_FLAGS=CC="${CC}" CFLAGS="${CFLAGS}"
 
 NO_TEST=   Yes
 
+MAKE_FILE= makefile
+
+ALL_TARGET=tcp tcp6
+
 do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/NPtcp ${PREFIX}/bin
-   ${INSTALL_MAN} ${WRKBUILD}/netpipe.1 ${PREFIX}/man/man1
cd ${PREFIX}/bin && ln -sf NPtcp netpipe
-   
+   ${INSTALL_PROGRAM} ${WRKBUILD}/NPtcp6 ${PREFIX}/bin
+   ${INSTALL_MAN} ${WRKBUILD}/dox/netpipe.1 ${PREFIX}/man/man1
+
 .include 
Index: distinfo
===
RCS file: /cvs/ports/benchmarks/netpipe/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo18 Jan 2015 03:12:51 -  1.5
+++ distinfo18 Oct 2016 21:09:47 -
@@ -1,2 +1,2 @@
-SHA256 (NetPIPE_2.4.tar.gz) = LUYjlHvxj0Qd6Dd+EOC76pTLN2RgcrssQ0qN8V30/nE=
-SIZE (NetPIPE_2.4.tar.gz) = 23009
+SHA256 (NetPIPE-3.7.2.tar.gz) = E9rIhP9SlRY29lHEIfX/SoUyGKlaoopKhSQC7jhaKrg=
+SIZE (NetPIPE-3.7.2.tar.gz) = 400248
Index: patches/patch-netpipe_h
===
RCS file: /cvs/ports/benchmarks/netpipe/patches/patch-netpipe_h,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-netpipe_h
--- patches/patch-netpipe_h 8 Jul 2011 09:33:25 -   1.1
+++ patches/patch-netpipe_h 18 Oct 2016 21:09:47 -
@@ -1,24 +0,0 @@
-$OpenBSD: patch-netpipe_h,v 1.1 2011/07/08 09:33:25 jasper Exp $
 netpipe.h.orig Tue Apr 27 22:55:57 1999
-+++ netpipe.h  Fri Jul  8 11:32:28 2011
-@@ -20,6 +20,7 @@
- #include  /* malloc(3) */
- #include 
- #include 
-+#include 
- #include/* struct timeval */
- #ifdef HAVE_GETRUSAGE
- #include 
-@@ -38,8 +39,12 @@
- #define  MAXINT 2147483647
- 
- #define ABS(x) (((x) < 0)?(-(x)):(x))
-+#ifndef MIN
- #define MIN(x,y)   (((x) < (y))?(x):(y))
-+#endif
-+#ifndef MAX
- #define MAX(x,y)   (((x) > (y))?(x):(y))
-+#endif
- 
- /* Need to include the protocol structure header file.   
*/
- /* Change this to reflect the protocol   
*/
Index: pkg/PLIST
===
RCS file: /cvs/ports/benchmarks/netpipe/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST   6 Aug 2004 14:37:29 -   1.3
+++ pkg/PLIST   18 Oct 2016 21:09:47 -
@@ -1,4 +1,4 @@
 @comment $OpenBSD: PLIST,v 1.3 2004/08/06 14:37:29 espie Exp $
-bin/NPtcp
-bin/netpipe
+@bin bin/NPtcp
+@bin bin/NPtcp6
 @man man/man1/netpipe.1

Re: openvpn-auth-ldap problem

[Jeremie Courreges-Anglas]

Pascal Stumpf  writes:

> On Sun, 16 Oct 2016 12:17:40 +0100, Stuart Henderson wrote:
>> On 2016/10/11 19:00, Leclerc, Sebastien wrote:
>> > When starting OpenVPN with module openvpn-auth-ldap activated, I get the 
>> > following:
>> > 
>> > openvpn:/usr/local/lib/openvpn-auth-ldap.so: /usr/lib/libobjc.so.6.0 : 
>> > WARNING: symbol(__objc_class_name_Protocol) size mismatch, relink your 
>> > program
>> > openvpn:/usr/local/lib/openvpn-auth-ldap.so: /usr/lib/libobjc.so.6.0 : 
>> > WARNING: symbol(__objc_class_name_Object) size mismatch, relink your 
>> > program
>> > 
>> > Openvpn and openvpn-auth-ldap are installed as packages.
>> > 
>> > This is from a snapshot (amd64) :
>> > OpenBSD 6.0-current (GENERIC.MP) #2518: Sun Oct  2 21:41:07 MDT 2016
>> > openvpn-2.3.11
>> > openvpn-auth-ldap-2.0.3.p2
>> > 
>> > Same result from 5.9 with patch (amd64) :
>> > OpenBSD 5.9 (GENERIC.MP) #8: Thu Jul 14 20:12:22 CEST 2016
>> > openvpn-2.3.10
>> > openvpn-auth-ldap-2.0.3p1
>> > 
>> > 
>> > Sebastien Leclerc
>> > 
>> 
>> Two problems.
>> 
>> One: base and ports gcc use the same library version for libobjc.
>> I'm sure this is wrong and hid the problem (otherwise pkg_create
>> checks would have caught it).
>> 
>> Index: 4.9/Makefile
>> ===
>> RCS file: /cvs/ports/lang/gcc/4.9/Makefile,v
>> retrieving revision 1.41
>> diff -u -p -r1.41 Makefile
>> --- 4.9/Makefile 18 Sep 2016 15:05:15 -  1.41
>> +++ 4.9/Makefile 16 Oct 2016 10:57:43 -
>> @@ -4,7 +4,7 @@ ONLY_FOR_ARCHS = amd64 arm hppa i386 mip
>>  DPB_PROPERTIES = parallel
>>  
>>  V = 4.9.4
>> -REVISION = 2
>> +REVISION = 3
>>  FULL_VERSION = $V
>>  FULL_PKGVERSION = $V
>>  
>> @@ -44,7 +44,7 @@ SHARED_LIBS =  estdc++ 17.0 \
>>  gcj 4.0 \
>>  gcj-tools   4.0 \
>>  gij 4.0 \
>> -objc6.0 \
>> +objc7.0 \
>>  ssp 4.0 \
>>  lto_plugin  3.0 \
>>  go  3.0 \
>> 
>> 
>> Two, even with this fixed, the linker is preferring the version
>> in /usr/local/lib/ (possibly because it's a higher-numbered version?)
>
> Yes.
>
>> I'm not sure how to fix this. So the diff above switches us from
>> building a broken package if gcc-libs is installed, to failing
>> to build if gcc-libs is installed. So it doesn't really gain us
>> much in practical terms for openvpn-auth-ldap.
>> 
>> I also tried to workaround by building with ports gcc, ports
>> infrastructure isn't really setup for objc builds - it's easy enough to
>> add that, but in the case of openvpn-auth-ldap the configure script is
>> failing when doing checks on the objc preprocessor.
>> 
>> It would be nice if someone with knowledge about the objc toolchain
>> or an interest in fixing openvpn-auth-ldap could take a look.
>> 
>
> I don't claim to know much about objc, but I think the correct solution
> would be to either rename libobj from lang/gcc to libeobjc (and make the
> port use it) or go the fortran route and remove support from base.
> According to sqlports, openvpn-auth-ldap is the only port with objc in
> WANTLIB (GNUstep stuff uses clang + libobjc2).

Same stance wrt objc, I think we should remove it from base.  I took
a quick look at this openvpn plugin (last update from 2007...) and it
looks like just using gobjc from ports isn't enough.  Debian has patches
to allow building with gcc 4.6+, those patches look interesting but
I did not dig further.  There also are mentions of gnustep in their
package.

Anyway, is the plugin broken right now, or is that report just about
runtime linker warnings?

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

Re: UPDATE: net/profanity

[Theo Buehler]

On Wed, Oct 05, 2016 at 03:05:52PM +0200, Theo Buehler wrote:
> On Fri, Sep 30, 2016 at 07:56:08AM +0200, Rafael Sadowski wrote:
> > New diff:
> > 
> > - without e2fsprogs and nghttp2 LIB_DEPENDS
> > -- port-lib-depends-check looks good
> > - replace /usr/local with $TRUEPREFIX
> > - portcheck is happy again
> 
> This looks good to me: tested this since Friday on amd64.  The
> individual build targets work without issues, no compiler warnings,
> except the usual string stuff, tests all pass and portcheck is happy.
> 
> sthen, if this looks good to you as well and you want to import this and
> its dependency libstrophe, ok tb
> 

ping

> 
> Rafael, one question: there are two test suites bundled: unit tests and
> functional tests. We currently only run the unit tests. Have you looked
> into the functional tests?
> 
> The functional tests have two additional dependencies that currently
> don't have ports, libstabber https://github.com/boothj5/stabber (which
> looks very much like WIP and would currently probably only be useful for
> this and libmicrohttpd https://www.gnu.org/software/libmicrohttpd/
> (which might be useful otherwise). I do have a working port of
> libmicrohttpd ready, I can send it if there's any interest.
> 

Re: Adding dfrotz to games/frotz

[Stuart Henderson]

On 2016/10/18 18:52, tonypon...@mail.com wrote:
> The following patch installs dfrotz as part of the games/frotz port.
> dfrotz is the "dumb terminal" interface for frotz.  It is useful for
> making transcripts of frotz games.

Makes sense, committed with a REVISION bump.
> 
> --- ports/games/frotz/Makefile.orig   Thu Jun  4 06:17:38 2015
> +++ ports/games/frotz/MakefileSun Sep 25 23:33:47 2016
> @@ -18,7 +18,8 @@
>  MAKE_FLAGS=  CC="${CC}" OPTS="${CFLAGS}" CONFIG_DIR="${SYSCONFDIR}"
>  FAKE_FLAGS=  PREFIX=${WRKINST}${TRUEPREFIX}
>  
> -ALL_TARGET=  frotz
> +ALL_TARGET=  frotz dfrotz
> +INSTALL_TARGET=  install install_dumb
>  
>  CFLAGS +=-DUSE_UNISTD_H -DCOLOR_SUPPORT -DEMACS_EDITING
>  
> --- ports/games/frotz/pkg/PLIST.orig  Fri Oct 24 12:17:23 2008
> +++ ports/games/frotz/pkg/PLIST   Sun Sep 25 23:33:47 2016
> @@ -1,3 +1,5 @@
>  @comment $OpenBSD: PLIST,v 1.4 2008/10/24 12:17:23 jasper Exp $
> +@bin bin/dfrotz
>  @bin bin/frotz
> +@man man/man6/dfrotz.6
>  @man man/man6/frotz.6
> 

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/18 13:19:29

Modified files:
games/frotz: Makefile 
games/frotz/pkg: PLIST 

Log message:
build/install the dfortz "dumb terminal" interface; from tonypony76 at mail.com

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2016/10/18 12:54:35

Modified files:
net/libcares   : Tag: OPENBSD_5_9 Makefile 
Added files:
net/libcares/patches: Tag: OPENBSD_5_9 patch-ares_create_query_c 

Log message:
backport fix for CVE-2016-5180

ok jca@

CVS: cvs.openbsd.org: ports

[Joerg Jung]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/18 12:08:41

Modified files:
misc/insult: Makefile distinfo 

Log message:
update to 0.4 release

Re: ansible: openbsd_pkg fails to run when just specifying the package name

[Jasper Lievisse Adriaanse]

On Tue, Oct 18, 2016 at 07:58:00AM +0200, Patrik Lundin wrote:
> On Tue, Oct 18, 2016 at 06:30:41AM +0200, Jasper Lievisse Adriaanse wrote:
> >
> > I was hoping that 2.2.0.0 would be released soon, but it seems upstream 
> > enjoys
> > many a rc over a lengthy period of time. So perhaps syncing the openbsd_pkg
> > provider with master would be the way to go.
> > 
> 
> This would be my personal preference. This also means the local addition
> of -z comes into question as the upstream changes replace "pkg_info -e"
> with "pkg_info -Iq" for looking up package state, which does not handle
> name lookups in the same way.
> 
> I believe landry@ should be involved in this decision because from what I
> recall he is one of the people who wanted the addition (and might be depending
> on it).
> 
> I'll repeat my original thoughts about this from when I added the branch
> support:
> ===
> I should add that I think the -z addition may actually work worse on the
> latest code, because i switched the usage of "pkg_info -e" to "pkg_info
> -Iq inst:name" for finding out the state of a requested package. While
> -e manages to find a package without the patchlevel version attached
> (which i believe was a benefit that -z added), this does not
> seem to be true for "-Iq inst:".
> 
> This could mean that the module will always think that the package
> needs to be installed because it can't tell there is a package with the
> supplied name (plus patchlevel) already installed.
> ===
> 
> -- 
> Patrik Lundin
I think part of the reason why -z was added was precisely to "workaround" the
problem that was resolved with the support for branch notation. So this diff
below is a sync with upstream devel as of right now, which is due to be
released as part of ansible 2.2.0.0, and thus drops our local -z patch.

Index: Makefile
===
RCS file: /cvs/ports/sysutils/ansible/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- Makefile15 Oct 2016 09:04:36 -  1.62
+++ Makefile18 Oct 2016 18:11:05 -
@@ -4,7 +4,7 @@ COMMENT =   ssh based config management f
 
 MODPY_EGG_VERSION =2.1.2.0
 DISTNAME = ansible-${MODPY_EGG_VERSION}
-REVISION = 3
+REVISION = 4
 
 CATEGORIES =   sysutils
 
Index: patches/patch-lib_ansible_modules_extras_packaging_os_openbsd_pkg_py
===
RCS file: 
/cvs/ports/sysutils/ansible/patches/patch-lib_ansible_modules_extras_packaging_os_openbsd_pkg_py,v
retrieving revision 1.5
diff -u -p -r1.5 patch-lib_ansible_modules_extras_packaging_os_openbsd_pkg_py
--- patches/patch-lib_ansible_modules_extras_packaging_os_openbsd_pkg_py
15 Oct 2016 08:33:52 -  1.5
+++ patches/patch-lib_ansible_modules_extras_packaging_os_openbsd_pkg_py
18 Oct 2016 18:11:05 -
@@ -1,32 +1,107 @@
 $OpenBSD: patch-lib_ansible_modules_extras_packaging_os_openbsd_pkg_py,v 1.5 
2016/10/15 08:33:52 jasper Exp $
 
-Hunks 3+4:
-From 2001172027e339037adaa290e77a7700c818ad57 Mon Sep 17 00:00:00 2001
-From: Patrik Lundin 
-Date: Wed, 12 Oct 2016 20:51:22 +0200
-Subject: [PATCH 1/2] openbsd_pkg: Use correct part of name in match.
+sync with upstream revision 16b8128
 
 lib/ansible/modules/extras/packaging/os/openbsd_pkg.py.origFri Oct 
14 14:30:50 2016
-+++ lib/ansible/modules/extras/packaging/os/openbsd_pkg.py Fri Oct 14 
14:30:40 2016
-@@ -144,7 +144,7 @@ def package_present(name, installed_state, pkg_spec, m
- build = module.params['build']
- 
- if module.check_mode:
--install_cmd = 'pkg_add -Imn'
-+install_cmd = 'pkg_add -Imnz'
- else:
- if build is True:
- port_dir = "%s/%s" % (module.params['ports_dir'], 
get_package_source_path(name, pkg_spec, module))
-@@ -159,7 +159,7 @@ def package_present(name, installed_state, pkg_spec, m
- else:
- module.fail_json(msg="the port source directory %s does not 
exist" % (port_dir))
- else:
--install_cmd = 'pkg_add -Im'
-+install_cmd = 'pkg_add -Imz'
+--- lib/ansible/modules/extras/packaging/os/openbsd_pkg.py.origThu Sep 
29 17:01:33 2016
 lib/ansible/modules/extras/packaging/os/openbsd_pkg.py Tue Oct 18 
20:09:30 2016
+@@ -19,10 +19,13 @@
+ # along with Ansible.  If not, see .
+ 
+ import os
++import platform
+ import re
+ import shlex
+ import sqlite3
+ 
++from distutils.version import StrictVersion
++
+ DOCUMENTATION = '''
+ ---
+ module: openbsd_pkg
+@@ -82,6 +85,9 @@ EXAMPLES = '''
+ # Specify the default flavour to avoid ambiguity errors
+ - openbsd_pkg: name=vim-- state=present
+ 
++# Specify a package branch (requires at least OpenBSD 6.0)
++- openbsd_pkg: name=python%3.5 state=present
++
+ # Update all packages on the system
+ - openbsd_pkg: name=* state=latest
+ '''
+@@ -94,47 +100,22 @@ def 

CVS: cvs.openbsd.org: ports

[Joerg Jung]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/18 12:10:09

Modified files:
x11/sct: Makefile distinfo 

Log message:
update to 0.3 release

CVS: cvs.openbsd.org: ports

[Joerg Jung]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/10/18 12:05:19

Modified files:
mail/opensmtpd-extras: Makefile distinfo 

Log message:
update to latest snapshot

ok giovanni

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2016/10/18 12:00:58

Modified files:
net/libcares   : Tag: OPENBSD_6_0 Makefile 
Added files:
net/libcares/patches: Tag: OPENBSD_6_0 patch-ares_create_query_c 

Log message:
backport fix for CVE-2016-5180

ok jca@

UPDATE: Zile-2.4.12

[Gonzalo L. Rodriguez]

Hello,

Little update for Zile to 2.4.12

Ok?

-- 
Sending from my toaster.
Index: Makefile
===
RCS file: /cvs/ports/editors/zile/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile19 Mar 2014 15:29:50 -  1.45
+++ Makefile18 Oct 2016 16:54:25 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.45 2014/03/19 15:29:50 bcallah Exp $
 
 COMMENT=   lightweight Emacs clone
-DISTNAME=  zile-2.4.11
+DISTNAME=  zile-2.4.12
 CATEGORIES=editors
 HOMEPAGE=  https://www.gnu.org/software/zile/
 
Index: distinfo
===
RCS file: /cvs/ports/editors/zile/distinfo,v
retrieving revision 1.36
diff -u -p -r1.36 distinfo
--- distinfo19 Mar 2014 15:29:50 -  1.36
+++ distinfo18 Oct 2016 16:54:25 -
@@ -1,2 +1,2 @@
-SHA256 (zile-2.4.11.tar.gz) = H9J7vdxhSRsfuymjRdDTRHNKqegM+gewKJLu34Mfqcw=
-SIZE (zile-2.4.11.tar.gz) = 1293707
+SHA256 (zile-2.4.12.tar.gz) = KS2NOMI+d0A8vYwWvep0KuuzVz2aslRb2H9cPhvHUHE=
+SIZE (zile-2.4.12.tar.gz) = 1295271

CVS: cvs.openbsd.org: ports

[Pascal Stumpf]

CVSROOT:/cvs
Module name:ports
Changes by: pas...@cvs.openbsd.org  2016/10/18 10:59:02

Modified files:
net/tor: Makefile distinfo 

Log message:
SECURITY update to 0.2.8.9.

Re: ansible: openbsd_pkg fails to run when just specifying the package name

[Patrik Lundin]

On Tue, Oct 18, 2016 at 09:19:22AM +0200, Landry Breuil wrote:
> 
> So the original idea was more or less to use -z to 'fake' branch
> support when it wasnt existing.
> 

Maby this is a good time to retire the local patch if the branch syntax
solves those problems for newer systems?

> As for pkg_info -e vs pkg_info -Iq, i dont know what was the intent of
> the change nor if it was good or not
>

The reason for the change was to make the branch syntax work. -Iq
inst: can expand a name based on the branch syntax to the actual
installed version, which -e can not do:
===
$ pkg_info -e autoconf%2.13
Invalid spec: autoconf%2.13

$ pkg_info -Iq inst:autoconf%2.13
autoconf-2.13p4
===

>
> but here -Iq finds an installed
> package by giving only its name (but not if you pass the version without
> patchlevel):
> 
> $pkg_info -Iq ansible
> ansible-2.1.1.0p2
> $pkg_info -e ansible
> Invalid spec: ansible
> $pkg_info -e ansible-2.1.1.0
> inst:ansible-2.1.1.0p2
> $pkg_info -Dunsigned -Iq ansible-2.1.1.0
> Error from 
> http://ftp.fr.openbsd.org/pub/OpenBSD/snapshots/packages/amd64/ansible-2.1.1.0.tgz
> ftp: Error retrieving file: 404 Not Found
> $pkg_info -Iq ansible-2.1.1.0p2
> ansible-2.1.1.0p2
> 
> The only 'advantage' of -e here is that it finds it if you pass the full
> version without the patchlevel.
> 

Right, the reason for the switch was the requirement to find the real
package on disk when a user supplies a name using the branch syntax.

-- 
Patrik Lundin

Re: [NEW] www/tbb improved, updated

[attila]

attila  writes:

> attila  writes:
>
>> Hi ports@,
>>
>> Here is a new and improved tarball for the Tor Browser ports.  After
>> semarie@'s comments and the other feedback on my last attempt I came
>> up with another way that might also be acceptable to upstream.
>>
>> The issue is: where does Tor browser store its state?  The answers for
>> other platforms don't apply to our situation.  Under OSX and Windows
>> there is already a canonical place where per-user data goes, and in
>> fact the new --enable-tor-browser-data-outside-app-dir configure
>> option impacts this on both.  Under Linux the bundle takes care of
>> this by storing all the software and state under a single directory
>> tree under your home directory.
>>
>> In our case we have packaged the software to be installed under
>> /usr/local but can't store any state there.  Instead of #ifdef __OpenBSD__
>> I added an --enable-tor-browser-data-in-home-dir configure option;
>> this option implies --enable-tor-browser-data-outside-app-dir since it
>> is effectively a special case of it.
>>
>> With this, user state is stored in ~/TorBrowser-Data, which is the
>> directory name used by --enable-tor-browser-data-ouside-app-dir.  The
>> only difference is that we store it under the home directory instead
>> of a platform-specific path (~/Library/mumble... under OSX, dunno
>> under Windows).
>>
>> I think I've also addressed all the outstanding concerns raised on
>> other threads: the torbutton port no longer patches out the version
>> check, the log verbosity and output method are default again in both
>> torbutton and tor-launcher.  I'm still using the geoip data files
>> installed with net/tor but if anyone objects I can package geoip{,6}
>> with tor-launcher instead.
>>
>> The ports have been updated to 6.0.5 (released 16 Sept), which deals
>> with the recently disclosed issue with certificate pinning.
>>
>> We have built and tested these ports under amd64 and i386 on the early
>> 22 Sept snap.
>
> Thanks to Mattieu Baptiste for pointing out that the sqlite3 -> ports
> changes broke the tor-browser port build.  It turns out we should be
> using the bundled sqlite3 anyway, and mozilla.port.mk has an option to
> do this.  Attached are updated ports that reflect this and build on
> the (earliest) 3 Oct snap.  Tested on amd64.
>
> Feedback, comments, most welcome.
>
> Pax, -A

Ping.  Ports attached for convenience.

Pax, -A
--
http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF


tbb605-bbis.tgz
Description: tor browser bundle ports

Re: openvpn-auth-ldap problem

[Pascal Stumpf]

On Sun, 16 Oct 2016 12:17:40 +0100, Stuart Henderson wrote:
> On 2016/10/11 19:00, Leclerc, Sebastien wrote:
> > When starting OpenVPN with module openvpn-auth-ldap activated, I get the 
> > following:
> > 
> > openvpn:/usr/local/lib/openvpn-auth-ldap.so: /usr/lib/libobjc.so.6.0 : 
> > WARNING: symbol(__objc_class_name_Protocol) size mismatch, relink your 
> > program
> > openvpn:/usr/local/lib/openvpn-auth-ldap.so: /usr/lib/libobjc.so.6.0 : 
> > WARNING: symbol(__objc_class_name_Object) size mismatch, relink your program
> > 
> > Openvpn and openvpn-auth-ldap are installed as packages.
> > 
> > This is from a snapshot (amd64) :
> > OpenBSD 6.0-current (GENERIC.MP) #2518: Sun Oct  2 21:41:07 MDT 2016
> > openvpn-2.3.11
> > openvpn-auth-ldap-2.0.3.p2
> > 
> > Same result from 5.9 with patch (amd64) :
> > OpenBSD 5.9 (GENERIC.MP) #8: Thu Jul 14 20:12:22 CEST 2016
> > openvpn-2.3.10
> > openvpn-auth-ldap-2.0.3p1
> > 
> > 
> > Sebastien Leclerc
> > 
> 
> Two problems.
> 
> One: base and ports gcc use the same library version for libobjc.
> I'm sure this is wrong and hid the problem (otherwise pkg_create
> checks would have caught it).
> 
> Index: 4.9/Makefile
> ===
> RCS file: /cvs/ports/lang/gcc/4.9/Makefile,v
> retrieving revision 1.41
> diff -u -p -r1.41 Makefile
> --- 4.9/Makefile  18 Sep 2016 15:05:15 -  1.41
> +++ 4.9/Makefile  16 Oct 2016 10:57:43 -
> @@ -4,7 +4,7 @@ ONLY_FOR_ARCHS = amd64 arm hppa i386 mip
>  DPB_PROPERTIES = parallel
>  
>  V = 4.9.4
> -REVISION = 2
> +REVISION = 3
>  FULL_VERSION = $V
>  FULL_PKGVERSION = $V
>  
> @@ -44,7 +44,7 @@ SHARED_LIBS =   estdc++ 17.0 \
>   gcj 4.0 \
>   gcj-tools   4.0 \
>   gij 4.0 \
> - objc6.0 \
> + objc7.0 \
>   ssp 4.0 \
>   lto_plugin  3.0 \
>   go  3.0 \
> 
> 
> Two, even with this fixed, the linker is preferring the version
> in /usr/local/lib/ (possibly because it's a higher-numbered version?)

Yes.

> I'm not sure how to fix this. So the diff above switches us from
> building a broken package if gcc-libs is installed, to failing
> to build if gcc-libs is installed. So it doesn't really gain us
> much in practical terms for openvpn-auth-ldap.
> 
> I also tried to workaround by building with ports gcc, ports
> infrastructure isn't really setup for objc builds - it's easy enough to
> add that, but in the case of openvpn-auth-ldap the configure script is
> failing when doing checks on the objc preprocessor.
> 
> It would be nice if someone with knowledge about the objc toolchain
> or an interest in fixing openvpn-auth-ldap could take a look.
> 

I don't claim to know much about objc, but I think the correct solution
would be to either rename libobj from lang/gcc to libeobjc (and make the
port use it) or go the fortran route and remove support from base.
According to sqlports, openvpn-auth-ldap is the only port with objc in
WANTLIB (GNUstep stuff uses clang + libobjc2).

UPDATE: Lynis-2.3.4

[Gonzalo L. Rodriguez]

Hello,

Upgrade for Lynis to 2.3.4:

https://cisofy.com/changelog/lynis/2.3.4/

Ok? Comments?

Cheers.-

-- 
Sending from my toaster.
Index: Makefile
===
RCS file: /cvs/ports/security/lynis/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile24 Aug 2016 19:47:03 -  1.10
+++ Makefile18 Oct 2016 14:03:08 -
@@ -2,7 +2,7 @@
 
 COMMENT=   security auditing tool
 
-DISTNAME = lynis-2.3.2
+DISTNAME = lynis-2.3.4
 
 CATEGORIES=security
 
Index: distinfo
===
RCS file: /cvs/ports/security/lynis/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo24 Aug 2016 19:47:03 -  1.8
+++ distinfo18 Oct 2016 14:03:08 -
@@ -1,2 +1,2 @@
-SHA256 (lynis-2.3.2.tar.gz) = zMd8xmwUUmgk/TnfslObtgEknptwyH0dDy+RfiPbCXU=
-SIZE (lynis-2.3.2.tar.gz) = 269936
+SHA256 (lynis-2.3.4.tar.gz) = 7/pbk9HmwoTqYxeofwQaiiRCjJrMJuAKKYRL8WGjJn8=
+SIZE (lynis-2.3.4.tar.gz) = 252474
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/lynis/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST   24 Aug 2016 19:47:03 -  1.6
+++ pkg/PLIST   18 Oct 2016 14:03:08 -
@@ -30,12 +30,14 @@ share/lynis/db/languages/es
 share/lynis/db/languages/fr
 share/lynis/db/languages/hu
 share/lynis/db/languages/it
+share/lynis/db/languages/ja
 share/lynis/db/languages/nl
 share/lynis/db/languages/nl-BE
 share/lynis/db/languages/nl-NL
 share/lynis/db/languages/pl
 share/lynis/db/languages/pt
 share/lynis/db/languages/ru
+share/lynis/db/languages/se
 share/lynis/db/malware-susp.db
 share/lynis/db/malware.db
 share/lynis/db/sbl.db

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/18 08:28:14

Modified files:
graphics/jpeg  : Makefile distinfo 

Log message:
update to libjpeg-turbo 1.5.1, from brad

Re: [NEW] cbmc - Bounded Model Checker for C and C++

[Jeremie Courreges-Anglas]

Simon Mages  writes:

> Anything else i have to do?
>
> Or only wait until somebody picks it up and commits it?

New ports must be reviewed by at least a second developer.

As far as I'm concerned, the port looks good as is. ok jca@ is if
someone wants to import it.

Tarball attached for convenience.



cbmc.3.tar.gz
Description: Binary data

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

Re: neomutt

[Peter Hessler]

On 2016 Oct 18 (Tue) at 11:16:35 +0100 (+0100), Stuart Henderson wrote:
:(My original plan was to replace mutt completely

MASSIVE NAK on that, please.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/18 05:33:27

Modified files:
mail   : Makefile 
mail/mutt  : Makefile distinfo 
mail/mutt/patches: patch-main_c patch-mutt_sasl_c 
mail/mutt/pkg  : DESCR PLIST 

Log message:
update the main mutt port to 1.7.1, removing flavours:

sidebar - now in the main release (if you use this and your old configuration
doesn't work, review /usr/local/share/examples/mutt/sample.muttrc-sidebar)

compressed folders - use mail/neomutt if you want this

Re: [NEW] cbmc - Bounded Model Checker for C and C++

[Simon Mages]

Anything else i have to do?

Or only wait until somebody picks it up and commits it?

BR
Simon


2016-10-17 9:41 GMT+02:00, Simon Mages :
> Hi,
>
> 2016-10-16 19:17 GMT+02:00, Jeremie Courreges-Anglas :
>> Simon Mages  writes:
>>
>>> Hi,
>>>
>>> 2016-10-16 12:14 GMT+02:00, Stuart Henderson :
 On 2016/10/16 12:09, Simon Mages wrote:
> Ok, thanks for the feedback.
>
> But i really don't get the llvm dependency.
> I used the llvm in base on current to build
> this port. Why shouldi suddenly use this
> one?

 LLVM is not enabled in base. Anyway, setting MODULES=lang/clang will
 add the dep automatically.
>>> Finally i got it, i was working with wrong assumptions, sorry for that.
>>>
>>> Attached the new port.
>>>
>>> # tar zcvf /tmp/cbmc.tar.gz devel/cbmc
>>> devel/cbmc
>>> devel/cbmc/Makefile
>>> devel/cbmc/patches
>>> devel/cbmc/patches/patch-src_big-int_bigint-test_cc
>>> devel/cbmc/patches/patch-src_common~
>>> devel/cbmc/patches/patch-src_big-int_bigint_cc
>>> devel/cbmc/patches/patch-src_common
>>> devel/cbmc/patches/patch-minisat-2_2_1_minisat_core_Solver_cc
>>> devel/cbmc/patches/patch-minisat-2_2_1_minisat_core_SolverTypes_h
>>> devel/cbmc/patches/patch-minisat-2_2_1_minisat_mtl_IntTypes_h
>>> devel/cbmc/patches/patch-minisat-2_2_1_minisat_mtl_Vec_h
>>> devel/cbmc/patches/patch-minisat-2_2_1_minisat_simp_SimpSolver_cc
>>> devel/cbmc/patches/patch-minisat-2_2_1_minisat_utils_Options_h
>>> devel/cbmc/patches/patch-minisat-2_2_1_minisat_utils_ParseUtils_h
>>> devel/cbmc/distinfo
>>> devel/cbmc/pkg
>>> devel/cbmc/pkg/PLIST
>>> devel/cbmc/pkg/DESCR
>>>
>>> Lets see if now everything is alright :)
>>
>> Looks nicer, here are a few improvements:
>> - some spacing nits
>> - use MASTER_SITE_DEBIAN
>> - as Stuart pointed out, no need for p5-libwww any more
>> - respect CFLAGS, CXXFLAGS and LDFLAGS, using MAKE_FLAGS; this helps
>>   a lot for debug builds
>> - instead of putting the minisat2 patches in the port patches/
>>   directory, we could also just use upstream's patch in post-extract.
>>   From my POV those patches aren't my concern, so I don't care about
>>   them being tracked by CVS.
>> - patch the include file that provides the "compatibility" goo for
>>   alloca, instead of patching consumers.
>>
>> Updated tarball below.
> From my point of view we can just take the version you send.
> Its very interesting to see what the ports framework can do, thanks a lot
> @all
> people who replied so far :)
>
>> Note:  you create a dedicated section where to set CP_CXXFLAGS, LINKLIB,
>> etc on OpenBSD, an alternative could be to just amend the FreeBSD
>> section:
>>
>> -else ifeq ($(filter-out FreeBSD,$(BUILD_ENV_)),)
>> +else ifeq ($(filter-out FreeBSD OpenBSD,$(BUILD_ENV_)),)
>>
>> I doubt that it matters much, upstream may have an opinion already.
> The problem here is that the version of 'ar' we are using does not
> support the -T flag.
> Thats why i created the OpenBSD section in the first place.
>
> BR
> Simon
>

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/18 04:51:39

Modified files:
mail/neomutt   : Makefile 

Log message:
autoconf regen not needed

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/18 04:48:06

Modified files:
mail   : Makefile 

Log message:
hook up neomutt

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/18 04:47:15

Log message:
import ports/mail/neomutt, ok stsp@

This is the neomutt.org patched version of Mutt, currently based on 1.7.1,
and includes maintained versions of various third-party patches (sidebar,
compressed folders, etc).

Status:

Vendor Tag: sthen
Release Tags:   sthen_20161018

N ports/mail/neomutt/Makefile
N ports/mail/neomutt/distinfo
N ports/mail/neomutt/patches/patch-main_c
N ports/mail/neomutt/patches/patch-mutt_sasl_c
N ports/mail/neomutt/patches/patch-mutt_sasl_h
N ports/mail/neomutt/pkg/DESCR
N ports/mail/neomutt/pkg/PLIST

No conflicts created by this import

Re: neomutt

[Stefan Sperling]

On Tue, Oct 18, 2016 at 11:16:35AM +0100, Stuart Henderson wrote:
> Here's a newer one which has fixed a crash which I was able to trigger
> which I think may be the one you saw too.
> 
> At this point I would like to import it as a separate port alongside mutt.
> Any OKs for that?
> 
> (My original plan was to replace mutt completely, but at this point I think
> it's better to have a clean mutt-1.7.1 without the big array of patch options
> to allow it to be updated sanely, and a separate clean neomutt).

OK to import this version. I agree with this approach.

If this still crashes people can fall back to the old mutt port
or help fixing up neomutt if they really need all the patches.

Thanks!

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/18 04:22:40

Modified files:
mail/postfix/stable: Makefile distinfo 

Log message:
update to postfix-3.1.3, ok brad

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/18 04:22:26

Modified files:
mail/postfix/snapshot: Makefile distinfo 

Log message:
update to postfix-3.2-20161008, ok brad

Re: neomutt

[Stuart Henderson]

On 2016/10/17 13:11, Stefan Sperling wrote:
> On Sun, Oct 16, 2016 at 11:23:28PM +0200, Stefan Sperling wrote:
> > On Mon, Sep 26, 2016 at 01:07:30PM +0100, Stuart Henderson wrote:
> > > People who were seeing crashes with neomutt, please test this, and get
> > > me backtraces if you still see them (the port Makefile here is setup to
> > > build with symbols so you don't need to set DEBUG in this case).
> > > 
> > 
> > I've been running this with no issues.
> 
> Ugh. Apparently, I spoke too soon.

Here's a newer one which has fixed a crash which I was able to trigger
which I think may be the one you saw too.

At this point I would like to import it as a separate port alongside mutt.
Any OKs for that?

(My original plan was to replace mutt completely, but at this point I think
it's better to have a clean mutt-1.7.1 without the big array of patch options
to allow it to be updated sanely, and a separate clean neomutt).



neomutt.tgz
Description: application/tar-gz

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/18 03:40:25

Modified files:
graphics/darktable: Makefile distinfo 
graphics/darktable/patches: 

patch-src_external_rawspeed_RawSpeed_TiffIFD_cpp 

Log message:
update to darktable-2.0.6 and switch to the version of the RawSpeed patch
that was committed upstream

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/18 03:24:20

Modified files:
textproc/mupdf : Makefile 
textproc/mupdf/patches: patch-Makethird 
patch-source_fitz_load-jpx_c 

Log message:
- patch mupdf to cope with openjp2 update
- use sed -i instead of SUBST_CMD for easier update-patches management

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/10/18 03:23:34

Modified files:
graphics/openjp2: Makefile distinfo 
graphics/openjp2/patches: patch-CMakeLists_txt 
  patch-src_bin_jp2_convert_c 
  patch-src_lib_openmj2_opj_malloc_h 
Removed files:
graphics/openjp2/patches: patch-src_lib_openjp2_opj_malloc_h 

Log message:
update to openjp2-2.1.2 - a huge number of security fixes since 2.1.0, see
https://github.com/uclouvain/openjpeg/blob/v2.1.2/CHANGELOG.md

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/10/18 01:27:04

Modified files:
sysutils/awscli: Makefile distinfo 

Log message:
Update to awscli-1.11.6.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/10/18 01:26:26

Modified files:
net/py-boto: Makefile distinfo 

Log message:
Update to py-boto-2.43.0.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/10/18 01:26:42

Modified files:
net/py-botocore: Makefile distinfo 

Log message:
Update to py-botocore-1.4.63.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/10/18 01:20:17

Modified files:
mail/cyrus-imapd: Makefile distinfo 
mail/cyrus-imapd/patches: patch-Makefile_in patch-configure 
  patch-imap_mailbox_c 
  patch-imap_sync_client_c 
mail/cyrus-imapd/pkg: PLIST 

Log message:
Update to cyrus-imapd-2.5.10.

Re: ansible: openbsd_pkg fails to run when just specifying the package name

[Landry Breuil]

On Tue, Oct 18, 2016 at 07:58:00AM +0200, Patrik Lundin wrote:
> On Tue, Oct 18, 2016 at 06:30:41AM +0200, Jasper Lievisse Adriaanse wrote:
> >
> > I was hoping that 2.2.0.0 would be released soon, but it seems upstream 
> > enjoys
> > many a rc over a lengthy period of time. So perhaps syncing the openbsd_pkg
> > provider with master would be the way to go.
> > 
> 
> This would be my personal preference. This also means the local addition
> of -z comes into question as the upstream changes replace "pkg_info -e"
> with "pkg_info -Iq" for looking up package state, which does not handle
> name lookups in the same way.
> 
> I believe landry@ should be involved in this decision because from what I
> recall he is one of the people who wanted the addition (and might be depending
> on it).

For full history:

http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/sysutils/ansible/patches/Attic/patch-library_packaging_openbsd_pkg
=
Use -z when invoking pkg_add in openbsd_pkg module, so that one can use
for example php-fpm-5.4* and ensure the correct version is installed.
Previously, one had to specify the exact version, or ansible would fail
since there were alternatives.
=
And the discussion with upstream in the maze of github tickets:
https://github.com/ansible/ansible/issues/8990
https://github.com/ansible/ansible-modules-extras/issues/97

So the original idea was more or less to use -z to 'fake' branch
support when it wasnt existing.

As for pkg_info -e vs pkg_info -Iq, i dont know what was the intent of
the change nor if it was good or not, but here -Iq finds an installed
package by giving only its name (but not if you pass the version without
patchlevel):

$pkg_info -Iq ansible
ansible-2.1.1.0p2
$pkg_info -e ansible
Invalid spec: ansible
$pkg_info -e ansible-2.1.1.0
inst:ansible-2.1.1.0p2
$pkg_info -Dunsigned -Iq ansible-2.1.1.0
Error from 
http://ftp.fr.openbsd.org/pub/OpenBSD/snapshots/packages/amd64/ansible-2.1.1.0.tgz
ftp: Error retrieving file: 404 Not Found
$pkg_info -Iq ansible-2.1.1.0p2
ansible-2.1.1.0p2

The only 'advantage' of -e here is that it finds it if you pass the full
version without the patchlevel.

Landry

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/10/18 00:59:02

Modified files:
devel/llvm/patches: patch-tools_clang_lib_Driver_Tools_cpp 
Added files:
devel/llvm/patches: patch-tools_lld_COFF_CMakeLists_txt 

Log message:
Add patch from upstream to fix the build issue with CMake.

fom Brad (maintainer)

UPDATE: emulators/snes9x

[Anthony J. Bentley]

Hi,

Here is an update to the recently released snes9x-1.54.1.

It looks like there is no longer any asm--would appreciate a test on i386.

ok?

Index: Makefile
===
RCS file: /cvs/ports/emulators/snes9x/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile2 Apr 2015 14:14:33 -   1.30
+++ Makefile18 Oct 2016 06:39:15 -
@@ -4,43 +4,36 @@ COMMENT = emulates the Super Nintendo En
 BROKEN-alpha = ICE/failure on filter/hq2x.cpp
 BROKEN-hppa =  ICE/failure on filter/hq2x.cpp
 
-DISTNAME = snes9x-1.52-src
-PKGNAME =  ${DISTNAME:S/-src//}
+DISTNAME = snes9x-1.54.1
 CATEGORIES =   emulators games
 
-REVISION = 7
-
 HOMEPAGE = http://www.snes9x.com/
 
 # non-commercial
 PERMIT_PACKAGE_CDROM = No
 PERMIT_PACKAGE_FTP =   Yes
 
-WANTLIB =  X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
-   Xi Xinerama Xrandr Xrender Xv atk-1.0 c cairo expat \
-   fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0 \
-   gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 \
-   pangoft2-1.0 pixman-1 pthread pthread-stubs stdc++ \
-   xcb xcb-render xcb-render-util z gdk_pixbuf-2.0 \
-   glade-2.0 SDL png xml2 gtk-x11-2.0 gdk-x11-2.0
+WANTLIB += SDL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender Xv atk-1.0 c cairo fontconfig freetype
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
+WANTLIB += gthread-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 png pthread xml2 z
 
 MASTER_SITES = https://sites.google.com/site/bearoso/snes9x/
 EXTRACT_SUFX = .tar.bz2
 
 RUN_DEPENDS =  devel/desktop-file-utils \
x11/gtk+3,-guic
-LIB_DEPENDS =  devel/libglade2 \
-   devel/sdl \
+LIB_DEPENDS =  devel/sdl \
graphics/png \
textproc/libxml \
x11/gtk+2 
 
-.if ${MACHINE_ARCH} == "i386"
-BUILD_DEPENDS =  devel/nasm 
-.endif
-
 MODULES =  devel/gettext \
-   textproc/intltool
+   textproc/intltool \
+   gcc4
+MODGCC4_LANGS =c++
+MODGCC4_ARCHS =*
 
 USE_GMAKE =Yes
 
Index: distinfo
===
RCS file: /cvs/ports/emulators/snes9x/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo18 Jan 2015 03:13:51 -  1.6
+++ distinfo18 Oct 2016 06:39:15 -
@@ -1,2 +1,2 @@
-SHA256 (snes9x-1.52-src.tar.bz2) = NuCbLaYrkhD+siTP0YMEehUaccHV5fknSdwovUt/8cs=
-SIZE (snes9x-1.52-src.tar.bz2) = 1720137
+SHA256 (snes9x-1.54.1.tar.bz2) = J9urVeQBk9Y3Td7MD9VP5TqzWyqtfu8emJwMC6mCtmI=
+SIZE (snes9x-1.54.1.tar.bz2) = 1990069
Index: patches/patch-gtk_configure
===
RCS file: /cvs/ports/emulators/snes9x/patches/patch-gtk_configure,v
retrieving revision 1.4
diff -u -p -r1.4 patch-gtk_configure
--- patches/patch-gtk_configure 1 Jun 2013 19:19:16 -   1.4
+++ patches/patch-gtk_configure 18 Oct 2016 06:39:15 -
@@ -1,12 +1,12 @@
-$OpenBSD: patch-gtk_configure,v 1.4 2013/06/01 19:19:16 ajacoutot Exp $
 gtk/configure.orig Sun Jan 10 18:28:11 2010
-+++ gtk/configure  Sun Oct  2 09:23:54 2011
-@@ -2351,7 +2351,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
+$OpenBSD$
+--- gtk/configure.orig Fri Oct 14 20:19:21 2016
 gtk/configure  Mon Oct 17 01:16:27 2016
+@@ -7072,7 +7072,7 @@ else
+   CFLAGS="$CFLAGS -fomit-frame-pointer"
+ fi
  
+-LIBS="$LIBS -lX11 -ldl -lXext"
++LIBS="$LIBS -lX11 -lXext"
  
--CFLAGS="-O2 -Wall -W -pedantic -Wno-unused-parameter -pipe $CFLAGS"
-+CFLAGS="-Wall -W -pedantic -Wno-unused-parameter $CFLAGS"
- CXXFLAGS="$CFLAGS"
- 
- ac_ext=c
+ ZSNESFX='#ZSNESFX=yes'
+ ZSNESC4='#ZSNESC4=yes'
Index: pkg/PLIST
===
RCS file: /cvs/ports/emulators/snes9x/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST   15 Jun 2012 08:32:15 -  1.6
+++ pkg/PLIST   18 Oct 2016 06:39:15 -
@@ -8,29 +8,17 @@ share/doc/snes9x/snapshots.txt
 share/doc/snes9x/snes9x-license.txt
 share/examples/snes9x/
 share/examples/snes9x/snes9x.conf.default
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/16x16/
-share/icons/hicolor/16x16/apps/
 share/icons/hicolor/16x16/apps/snes9x.png
-share/icons/hicolor/24x24/
-share/icons/hicolor/24x24/apps/
 share/icons/hicolor/24x24/apps/snes9x.png
-share/icons/hicolor/32x32/
-share/icons/hicolor/32x32/apps/
 share/icons/hicolor/32x32/apps/snes9x.png
-share/icons/hicolor/scalable/
-share/icons/hicolor/scalable/apps/
 share/icons/hicolor/scalable/apps/snes9x.svg
-share/locale/es_VE/
-share/locale/es_VE/LC_MESSAGES/
-share/locale/es_VE/LC_MESSAGES/snes9x-gtk.mo
+share/locale/es/LC_MESSAGES/snes9x-gtk.mo
 share/locale/fr_FR/