On 2016/04/21 23:21, Michael McConville wrote:
> Dmitrij D. Czarkoff wrote:
> > This diff sets PKGNAME and uses explicit HOMEPAGE. OK?
>
> I think you forgot the diff.
>
> In response to this:
>
> Stuart Henderson said:
> > And it changes the package name from sshfs-fuse to just sshfs.
>
> That ship sailed when we changed DISTNAME for the GitHub mirror.
> Regardless, it's probably easiest to just set HOMEPAGE.
Hmm? The PKGNAME stem for this port was always sshfs-fuse and it
has no impact on HOMEPAGE.
> +V = 2.7
> +DISTNAME = sshfs-${V}
> +PKGNAME = sshfs-fuse-${V}
yep that's better. let's GC the gettext module while there too.
OK with you sylvestre?
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/sshfs-fuse/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 25 Sep 2015 07:17:57 -0000 1.5
+++ Makefile 22 Apr 2016 08:37:38 -0000
@@ -2,23 +2,24 @@
COMMENT = mount remote directories over ssh
-DISTNAME = sshfs-fuse-2.5
+V = 2.7
+DISTNAME = sshfs-${V}
+PKGNAME = sshfs-fuse-${V}
CATEGORIES = sysutils
-HOMEPAGE = http://fuse.sourceforge.net/sshfs.html
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fuse/}
+HOMEPAGE = https://github.com/libfuse/sshfs
+MASTER_SITES = https://github.com/libfuse/sshfs/releases/download/${DISTNAME}/
MAINTAINER = Gallon Sylvestre <[email protected]>
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += c fuse glib-2.0 gthread-2.0 pthread
-
-MODULES= devel/gettext
+WANTLIB += c fuse glib-2.0 gthread-2.0 intl pthread
CONFIGURE_STYLE = gnu
-LIB_DEPENDS = devel/glib2
+LIB_DEPENDS = devel/gettext \
+ devel/glib2
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/sshfs-fuse/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 25 Sep 2015 07:17:57 -0000 1.2
+++ distinfo 22 Apr 2016 08:37:38 -0000
@@ -1,2 +1,2 @@
-SHA256 (sshfs-fuse-2.5.tar.gz) = 6RcUUuXQFQucaiFY/S4tzvtdXQO6TSCJSeAKOkbG5j4=
-SIZE (sshfs-fuse-2.5.tar.gz) = 136378
+SHA256 (sshfs-2.7.tar.gz) = zl+dOQk0/IjCh92TejnRXCtAy+ppZ7okrZPtkOACcSg=
+SIZE (sshfs-2.7.tar.gz) = 153014
Index: patches/patch-sshfs_c
===================================================================
RCS file: /cvs/ports/sysutils/sshfs-fuse/patches/patch-sshfs_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-sshfs_c
--- patches/patch-sshfs_c 25 Sep 2015 07:17:57 -0000 1.3
+++ patches/patch-sshfs_c 22 Apr 2016 08:37:38 -0000
@@ -1,15 +1,15 @@
$OpenBSD: patch-sshfs_c,v 1.3 2015/09/25 07:17:57 landry Exp $
---- sshfs.c.orig Wed Jan 8 16:34:52 2014
-+++ sshfs.c Fri Sep 25 09:16:48 2015
+--- sshfs.c.orig Tue Mar 1 11:49:53 2016
++++ sshfs.c Fri Apr 15 12:51:26 2016
@@ -11,7 +11,6 @@
#include <fuse.h>
#include <fuse_opt.h>
-#include <fuse_lowlevel.h>
- #include <assert.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -32,6 +31,7 @@
+ #ifdef __APPLE__
+ # include <fuse_darwin.h>
+ #endif
+@@ -37,6 +36,7 @@
#include <sys/utsname.h>
#include <sys/mman.h>
#include <sys/poll.h>
@@ -17,7 +17,7 @@ $OpenBSD: patch-sshfs_c,v 1.3 2015/09/25
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <glib.h>
-@@ -1552,7 +1552,7 @@ static int sftp_error_to_errno(uint32_t error)
+@@ -1615,7 +1615,7 @@ static int sftp_error_to_errno(uint32_t error)
case SSH_FX_NO_SUCH_FILE: return ENOENT;
case SSH_FX_PERMISSION_DENIED: return EACCES;
case SSH_FX_FAILURE: return EPERM;
