Re: [update] mail/nmh

2017-11-27 Thread Anthony J. Bentley
Pascal Stumpf writes:
> Update nmh to 1.7.  I've been using this for the past few days without
> problems (no-sasl) and lightly tested the sasl FLAVOR.

Been using 1.7rc3 for a few weeks now with no problems. Your diff is
slightly better than mine; ok with me.



[NEW] net/lua-mmdb

2017-11-27 Thread Frederic Cambus
Hi ports@,

Here is a new port: net/lua-mmdb

Comments? OK?

>From DESCR:

Lua library for reading MaxMind's Geolocation database format.


lua-mmdb.tar.gz
Description: application/tar-gz


[UPDATE] lang/go 1.9.1 -> 1.9.2

2017-11-27 Thread Klemens Nanni
Here's a simple version bump.

I already mailed jsing@ who asked for i386 testers so I'm just
forwarding it.

Can anyone test this on on their i386 machine? amd64 builds and passes
successfully:

ALL TESTS PASSED
9m38.97s real13m01.27s user12m31.48s system

All my applications continue to work as usual.

Feedback?

diff --git a/lang/go/Makefile b/lang/go/Makefile
index f7ddf512436..498eee90dff 100644
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS =${GO_ARCHS}
 
 COMMENT =  Go programming language
 
-VERSION =  1.9.1
+VERSION =  1.9.2
 EXTRACT_SUFX = .src.tar.gz
 DISTNAME = go${VERSION}
 PKGNAME =  go-${VERSION}
diff --git a/lang/go/distinfo b/lang/go/distinfo
index 83ab5420444..398711cf73a 100644
--- a/lang/go/distinfo
+++ b/lang/go/distinfo
@@ -1,2 +1,2 @@
-SHA256 (go1.9.1.src.tar.gz) = qEr8ncfWT+D6hNTXNeLs4jgxoiEXtQ2vx1wUhPHLVQ4=
-SIZE (go1.9.1.src.tar.gz) = 16377700
+SHA256 (go1.9.2.src.tar.gz) = Zl8YS/isiZhs/VpEYHNpdvYLV99rMgrXGtTO9TuxQ9w=
+SIZE (go1.9.2.src.tar.gz) = 16383591
diff --git a/lang/go/patches/patch-src_cmd_go_go_test_go 
b/lang/go/patches/patch-src_cmd_go_go_test_go
index d6f02a10d7c..9bedbed4eb7 100644
--- a/lang/go/patches/patch-src_cmd_go_go_test_go
+++ b/lang/go/patches/patch-src_cmd_go_go_test_go
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_cmd_go_go_test_go,v 1.2 2017/09/03 15:42:25 
jsing Exp $
 Index: src/cmd/go/go_test.go
 --- src/cmd/go/go_test.go.orig
 +++ src/cmd/go/go_test.go
-@@ -3475,6 +3475,9 @@ func TestCgoConsistentResults(t *testing.T) {
+@@ -3493,6 +3493,9 @@ func TestCgoConsistentResults(t *testing.T) {
switch runtime.GOOS {
case "freebsd":
testenv.SkipFlaky(t, 15405)
diff --git a/lang/go/pkg/PLIST b/lang/go/pkg/PLIST
index cf6a784f85a..64827841d0e 100644
--- a/lang/go/pkg/PLIST
+++ b/lang/go/pkg/PLIST
@@ -304,6 +304,8 @@ go/misc/cgo/test/issue20266/
 go/misc/cgo/test/issue20266.go
 go/misc/cgo/test/issue20266/issue20266.h
 go/misc/cgo/test/issue20369.go
+go/misc/cgo/test/issue21668.go
+go/misc/cgo/test/issue21708.go
 go/misc/cgo/test/issue2462.go
 go/misc/cgo/test/issue3250.go
 go/misc/cgo/test/issue3250w.go
@@ -3728,6 +3730,7 @@ go/src/internal/nettrace/nettrace.go
 go/src/internal/poll/
 go/src/internal/poll/export_posix_test.go
 go/src/internal/poll/export_test.go
+go/src/internal/poll/export_windows_test.go
 go/src/internal/poll/fd.go
 go/src/internal/poll/fd_io_plan9.go
 go/src/internal/poll/fd_mutex.go
@@ -3739,6 +3742,7 @@ go/src/internal/poll/fd_posix.go
 go/src/internal/poll/fd_posix_test.go
 go/src/internal/poll/fd_unix.go
 go/src/internal/poll/fd_windows.go
+go/src/internal/poll/fd_windows_test.go
 go/src/internal/poll/hook_cloexec.go
 go/src/internal/poll/hook_unix.go
 go/src/internal/poll/hook_windows.go
@@ -7209,6 +7213,9 @@ go/test/fixedbugs/issue21120.dir/a.go
 go/test/fixedbugs/issue21120.dir/b.go
 go/test/fixedbugs/issue21120.dir/main.go
 go/test/fixedbugs/issue21120.go
+go/test/fixedbugs/issue21655.go
+go/test/fixedbugs/issue21963.go
+go/test/fixedbugs/issue22083.go
 go/test/fixedbugs/issue2615.go
 go/test/fixedbugs/issue3552.dir/
 go/test/fixedbugs/issue3552.dir/one.go



Re: [UPDATE] Tor Browser 7.0.10

2017-11-27 Thread attila
attila  wrote:
> Hi ports@,
> 
> Attached is an update for the Tor Browser ports to 7.0.10.
> 
> Relevant release notes:
>   https://blog.torproject.org/tor-browser-7010-released
>   https://blog.torproject.org/tor-browser-709-released
>   https://blog.torproject.org/tor-browser-708-released
>   https://blog.torproject.org/tor-browser-707-released
> 
> Notable change: switch from GH to self-hosted tarballs at torbsd.org
> Also: took sthen@'s suggestion to make meta/tor-browser RDEP
> on specific versions.
> 
> Lightly tested on amd64.  Feedback most welcome.

Ping.  Update attached.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile.inc
--- www/tor-browser/Makefile.inc	21 Oct 2017 20:18:45 -	1.11
+++ www/tor-browser/Makefile.inc	17 Nov 2017 21:02:47 -
@@ -2,12 +2,12 @@
 
 MAINTAINER ?=		Sean Levy 
 HOMEPAGE ?=		https://www.torproject.org
-GH_ACCOUNT ?=		torbsd
+MASTER_SITES ?=		https://bits.torbsd.org/pub/OpenBSD/distfiles/
 PERMIT_PACKAGE_CDROM ?= Yes
 CATEGORIES =		www
 BROWSER_NAME =		tor-browser
 # XXX If updating, bump REVISION of any extensions which did not get updated.
-TB_VERSION =		7.0.6
+TB_VERSION =		7.0.10
 TB_PREFIX =		tb
 
 SUBST_VARS +=		BROWSER_NAME TB_VERSION
@@ -32,10 +32,6 @@ ADDON_XPI_FILE ?=	${TB_NAME}.xpi
 # Directory that the port's makexpi.sh script dumps into, if it has one
 ADDON_SUBDIR ?=		pkg
 ADDON_BUILDDIR ?= 	${WRKBUILD}/${ADDON_SUBDIR}
-.  if !defined(MASTER_SITES)
-GH_PROJECT ?=		${ADDON_NAME}
-GH_TAGNAME ?=		${V}
-.  endif
 
 CONFIGURE_STYLE ?=	none
 BUILD_DEPENDS +=	archivers/zip archivers/unzip
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- www/tor-browser/browser/Makefile	21 Oct 2017 20:18:45 -	1.20
+++ www/tor-browser/browser/Makefile	17 Nov 2017 21:02:47 -
@@ -6,21 +6,15 @@
 COMMENT =		modified version of Firefox ESR for browsing over Tor
 ONLY_FOR_ARCHS =	amd64 i386
 
-GH_PROJECT =		torb
-GH_TAGNAME =		v${TB_VERSION}-esr52.4.0
 MOZILLA_VERSION =	${TB_VERSION}
 MOZILLA_PROJECT =	${BROWSER_NAME}
 MOZILLA_CODENAME =	browser
 
-MASTER_SITES =		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/
 EXTRACT_SUFX =		.tar.gz
-DIST_SUBDIR =		${BROWSER_NAME}
-WRKDIST =		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
-
 PATCHORIG =		.pat.orig
 
 PKGNAME =		${TB_PREFIX}-browser-${TB_VERSION}
-DISTNAME =		${GH_TAGNAME}
+DISTNAME =		${BROWSER_NAME}-${TB_VERSION}
 
 SO_VERSION =		2.0
 MOZILLA_LIBS =		xul lgpllibs mozavcodec mozavutil
@@ -42,7 +36,7 @@ MOZILLA_USE_BUNDLED_NSS =	Yes
 MOZILLA_USE_BUNDLED_LIBEVENT =	Yes
 MOZILLA_USE_BUNDLED_SQLITE =	Yes
 
-WANTLIB +=		X11-xcb xcb xcb-shm intl ${LIBECXX}
+WANTLIB +=		X11-xcb intl xcb xcb-shm ${LIBECXX}
 
 LIB_DEPENDS +=		devel/gettext
 
@@ -63,7 +57,7 @@ CONFIGURE_ARGS +=	--with-app-name=${BROW
 			--with-tor-browser-version=${TB_VERSION}	\
 			--disable-tor-browser-update
 
-RUN_DEPENDS +=		net/tor>=0.3.1.7
+RUN_DEPENDS +=		net/tor>=0.3.1.8
 
 # bug 857628
 CONFIGURE_ARGS +=	--enable-pie
@@ -97,7 +91,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${BROWSER_DIR}/distribution
 	echo "[Global]\nid=OpenBSD\nversion=${OSREV}\n" > ${BROWSER_INI}
 	echo "about=Packaged by ${MAINTAINER}\n" >> ${BROWSER_INI}
-# install desktop file
+	# install desktop file
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
 	${SUBST_DATA} ${FILESDIR}/${BROWSER_NAME}.desktop \
 		${PREFIX}/share/applications/${BROWSER_NAME}.desktop
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- www/tor-browser/browser/distinfo	21 Oct 2017 20:18:45 -	1.10
+++ www/tor-browser/browser/distinfo	17 Nov 2017 21:02:47 -
@@ -1,2 +1,2 @@
-SHA256 (tor-browser/v7.0.6-esr52.4.0.tar.gz) = gnYmBK+i1kAa/Pkn8b3jgOPBVP/t1QRN8M5n0nY468c=
-SIZE (tor-browser/v7.0.6-esr52.4.0.tar.gz) = 294076794
+SHA256 (mozilla/tor-browser-7.0.10.tar.gz) = xAdqSaOkHPR+bUdv6dfkmeZYpfLYIfag4c8q/7twPGk=
+SIZE (mozilla/tor-browser-7.0.10.tar.gz) = 296565661
Index: www/tor-browser/https-everywhere/Makefile
===
RCS file: /cvs/ports/www/tor-browser/https-everywhere/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- www/tor-browser/https-everywhere/Makefile	21 Oct 2017 20:18:45 -	1.10
+++ www/tor-browser/https-everywhere/Makefile	17 Nov 2017 21:02:47 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.10 2017/10/21 20:18:45 sthen Exp $
 
 ADDON_NAME =		https-everywhere
-V =			2017.9.

Re: [UPDATE] graphics/sxiv 2.3.1 -> 24

2017-11-27 Thread Klemens Nanni
On Tue, Nov 21, 2017 at 11:15:38AM +0100, Klemens Nanni wrote:
> On Tue, Nov 21, 2017 at 01:44:44AM -0700, Anthony J. Bentley wrote:
> > Klemens Nanni writes:
> > > On Mon, Nov 06, 2017 at 02:21:41AM +0100, Klemens Nanni wrote:
> > > > Hey ports@,
> > > > 
> > > > here's a simple diff updating sxiv to the newest release; Yes, upstream
> > > > jumped from 2.3.1 to 24 not 2.4. These are mostly mechanical changes,
> > > > I've also updated the description as upstream did.
> > > > (snip)
> > > > -MAKE_FLAGS =   CC=${CC} MANPREFIX=${PREFIX}/man \
> > > > -   CFLAGS="${CFLAGS} -I${X11BASE}/include 
> > > > -I${PREFIX}/include" \
> > > > -   LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -lX11 
> > > > -lImlib2 -lexif
> > >  -lgif"
> > > > +MAKE_FLAGS =   CC=${CC} \
> > > > +   PREFIX=${PREFIX} \
> > 
> > No need to set PREFIX.
> PREFIX is hard coded to /usr/local in sxiv's Makefile and MANPATH uses
> it so why not letting users set PREFIX as they wish? Not passing it via
> MAKE_FLAGS would honor the user's PREFIX for MANPATH only.
> 
> > Also, I set V=1 so we can actually see the compiler commands.
> > 
> > > > +   CFLAGS="${CFLAGS} -I${X11BASE}/include 
> > > > -I${X11BASE}/include/fre
> > > etype2 -I${LOCALBASE}/include -I${LOCALBASE}/include/inotify" \
> > > > +   LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib 
> > > > -L${LOC
> > > ALBASE}/lib/inotify -lX11 -lXft -lImlib2 -lexif -linotify -lgif 
> > > -Wl,-rpath ${
> > > LOCALBASE}/lib/inotify"
> > 
> > Couple things. Existing LDFLAGS don't need to be passed to LDFLAGS,
> > because unlike CFLAGS it's not a standard variable likely to be in
> > mk.conf. Also, sxiv uses LDLIBS for the -l chain so we don't have to
> > repeat it.
> Thanks, that's better.
> > 
> > > >  post-install:
> > > > -   cd ${WRKSRC}/icon && make install
> > > > +   make -C ${WRKSRC}/icon install
> > 
> > No need for a cosmetic change like this...
> > 
> > 
> > Here's a (very) slightly modified version of your diff per above. I
> > don't understand the inotify stuff, but it matches what existing ports
> > do, so...
> Using inotify sxiv can automatically reload the currently displayed
> image if it changes on disk.
Bump; I'd like to get this in.

Anthony's diff seems fine but I still prefer to set PREFIX when we also
set MANPREFIX so here's his diff with that on top.

Does anyone want to commit any of the two versions?

diff --git a/graphics/sxiv/Makefile b/graphics/sxiv/Makefile
index eeb5fd17888..560018d753c 100644
--- a/graphics/sxiv/Makefile
+++ b/graphics/sxiv/Makefile
@@ -1,11 +1,10 @@
 # $OpenBSD: Makefile,v 1.10 2017/05/06 13:45:49 fcambus Exp $
 
-COMMENT =  simple (or small or suckless) X Image Viewer
+COMMENT =  simple X Image Viewer
 
 GH_PROJECT =   sxiv
 GH_ACCOUNT =   muennich
-GH_TAGNAME =   v1.3.2
-REVISION = 0
+GH_TAGNAME =   v24
 
 CATEGORIES =   graphics x11
 
@@ -14,17 +13,21 @@ MAINTAINER =Matthew Via 
 # GPLv2+
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB += Imlib2 exif gif X11 c
+WANTLIB += Imlib2 X11 Xft c exif gif lib/inotify/inotify
 
 RUN_DEPENDS =  devel/desktop-file-utils \
x11/gtk+3,-guic
 
-LIB_DEPENDS =  graphics/imlib2 \
+LIB_DEPENDS =  devel/libinotify \
+   graphics/imlib2 \
graphics/libexif
 
-MAKE_FLAGS =   CC=${CC} MANPREFIX=${PREFIX}/man \
-   CFLAGS="${CFLAGS} -I${X11BASE}/include -I${PREFIX}/include" \
-   LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -lX11 -lImlib2 -lexif 
-lgif"
+MAKE_FLAGS =   CC="${CC}" \
+   V=1 \
+   PREFIX=${PREFIX} \
+   MANPREFIX=${PREFIX}/man \
+   CFLAGS="${CFLAGS} -I${X11BASE}/include 
-I${X11BASE}/include/freetype2 -I${LOCALBASE}/include 
-I${LOCALBASE}/include/inotify" \
+   LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib 
-L${LOCALBASE}/lib/inotify -linotify -Wl,-rpath ${LOCALBASE}/lib/inotify"
 
 NO_TEST =  Yes
 
diff --git a/graphics/sxiv/distinfo b/graphics/sxiv/distinfo
index 78b5985c9ec..dcf76b04c13 100644
--- a/graphics/sxiv/distinfo
+++ b/graphics/sxiv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sxiv-1.3.2.tar.gz) = n1No3o8PV+eOvgLLUxoxEHqZPydpzsUbzI1w9cZotlM=
-SIZE (sxiv-1.3.2.tar.gz) = 46560
+SHA256 (sxiv-24.tar.gz) = UR3EXRKWKvnDHDBozmvKS4MqYmOUaye+/qSaSM8BkRA=
+SIZE (sxiv-24.tar.gz) = 47148
diff --git a/graphics/sxiv/patches/patch-Makefile 
b/graphics/sxiv/patches/patch-Makefile
index af27a365942..717afe06ea5 100644
--- a/graphics/sxiv/patches/patch-Makefile
+++ b/graphics/sxiv/patches/patch-Makefile
@@ -1,53 +1,31 @@
 $OpenBSD: patch-Makefile,v 1.4 2015/12/24 21:54:09 mmcc Exp $
 Makefile.orig  Sun Dec 20 07:21:25 2015
-+++ Makefile   Wed Dec 23 20:01:02 2015
-@@ -11,11 +11,11 @@ LIBS  := -lX11 -lImlib2
- 
- # optional dependencies:
- # giflib: gif animations
--  CPPFLAGS += -DHAVE_GIFLIB
--  LIBS += -lgif
-+CPPFLAGS += -DHAVE_GIFLIB
-+LIBS += -lgif
- # libexif: jpe

Re: [UPDATE] www/libwebsockets 2.3.0 => 2.4.0

2017-11-27 Thread Rafael Sadowski
On Sat Nov 25, 2017 at 10:28:25PM +0100, Adam Wolk wrote:
> On Sat, Nov 25, 2017 at 10:19:32PM +0100, Adam Wolk wrote:
> > Hi ports@
> > 
> > bump for libwebsockets attached.
> > 
> > Port changes:
> >  - LWS_WITHOUT_TEST_SERVER added and removing ssh
> >test keys in post-install. This is needed to prevent
> >the keys from being generated and installed. The
> >issue has been reported upstream with a patch, the
> >changes here are a workaround as I don't want to
> >create the patches folder just for that reason.
> > 
> >https://github.com/warmcat/libwebsockets/issues/1108
> >https://github.com/warmcat/libwebsockets/pull/1109
> > 
> >  - regenerated PLIST
> >  - bump SO
> > 
> > Upstream changelog:
> >  https://github.com/warmcat/libwebsockets/blob/v2.4-stable/changelog
> > 
> > tested on a -current amd64 snapshot compiled against a
> > closed source koparo.com product.
> > 
> > Any feedback, OKs?
> > 
> > Regards,
> > Adam
> 
> Right after sending the above I noticed there was a 2.4.1.
> Here's a bumped diff for that patch release.
> 

> Index: Makefile
> ===
> RCS file: /cvs/ports/www/libwebsockets/Makefile,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile
> --- Makefile  13 Sep 2017 09:04:43 -  1.14
> +++ Makefile  25 Nov 2017 21:27:14 -
> @@ -4,10 +4,10 @@ COMMENT =   lightweight C library for fas
>  
>  GH_ACCOUNT = warmcat
>  GH_PROJECT = libwebsockets
> -V =  2.3.0
> +V =  2.4.1
>  GH_TAGNAME = v$V

$V makes no sense to me



Re: new: restic [update to 0.8.0]

2017-11-27 Thread Manolis Tzanidakis
Hello all,
here is an updated port for the latest version (0.8.0) of restic.

I've dropped the patch for the test suite from the previous version (merged
upstream) and added a note about root requirements.
Both fixes by Björn Ketelaars (see below) -- thanks a lot, Björn.

On Tue (07/11/17), Björn Ketelaars wrote:
> 1.) make test fails on some tests, which require root. I think it makes sense
>   to add something like below to do-test:
> 
>@[ `id -u` == 0 ] || printf \
>"\n*** NOTE: restic fails on some tests, which require root ***\n\n"
> 
> 2.) another regression test issue is
>   https://github.com/restic/restic/issues/1307. I have send a fix - which
>   works for me: https://github.com/restic/restic/pull/1414. My patch however
>   has not (yet) been accepted upstream. For the fix to work on 0.7.3. I'm
>   using the diff below this mail.


restic-0.8.0.tgz
Description: GNU Unix tar archive