Re: update sysutils/sshfs-fuse, move to GitHub
Stuart Henderson wrote: > 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. I just meant that we already changed DISTNAME (and therefore PKGNAME) to sshfs in this patch and had to manually set it to sshfs-fuse.
Re: update sysutils/sshfs-fuse, move to GitHub
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 --- Makefile25 Sep 2015 07:17:57 - 1.5 +++ Makefile22 Apr 2016 08:37:38 - @@ -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 # 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 Index: distinfo === RCS file: /cvs/ports/sysutils/sshfs-fuse/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo25 Sep 2015 07:17:57 - 1.2 +++ distinfo22 Apr 2016 08:37:38 - @@ -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 - 1.3 +++ patches/patch-sshfs_c 22 Apr 2016 08:37:38 - @@ -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.cFri Sep 25 09:16:48 2015 +--- sshfs.c.orig Tue Mar 1 11:49:53 2016 sshfs.cFri Apr 15 12:51:26 2016 @@ -11,7 +11,6 @@ #include #include -#include - #include - #include - #include -@@ -32,6 +31,7 @@ + #ifdef __APPLE__ + # include + #endif +@@ -37,6 +36,7 @@ #include #include #include @@ -17,7 +17,7 @@ $OpenBSD: patch-sshfs_c,v 1.3 2015/09/25 #include #include #include -@@ -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;
Re: update sysutils/sshfs-fuse, move to GitHub
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. Sorry for taking us on so many needless diversions. Here's what I have now. Index: Makefile === RCS file: /cvs/ports/sysutils/sshfs-fuse/Makefile,v retrieving revision 1.5 diff -u -p -u -r1.5 Makefile --- Makefile25 Sep 2015 07:17:57 - 1.5 +++ Makefile22 Apr 2016 03:20:22 - @@ -2,11 +2,13 @@ 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 Index: distinfo === RCS file: /cvs/ports/sysutils/sshfs-fuse/distinfo,v retrieving revision 1.2 diff -u -p -u -r1.2 distinfo --- distinfo25 Sep 2015 07:17:57 - 1.2 +++ distinfo22 Apr 2016 03:20:22 - @@ -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 -u -r1.3 patch-sshfs_c --- patches/patch-sshfs_c 25 Sep 2015 07:17:57 - 1.3 +++ patches/patch-sshfs_c 22 Apr 2016 03:20:22 - @@ -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.cFri Sep 25 09:16:48 2015 +--- sshfs.c.orig Tue Mar 1 11:49:53 2016 sshfs.cFri Apr 15 12:51:26 2016 @@ -11,7 +11,6 @@ #include #include -#include - #include - #include - #include -@@ -32,6 +31,7 @@ + #ifdef __APPLE__ + # include + #endif +@@ -37,6 +36,7 @@ #include #include #include @@ -17,7 +17,7 @@ $OpenBSD: patch-sshfs_c,v 1.3 2015/09/25 #include #include #include -@@ -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;
Re: update sysutils/sshfs-fuse, move to GitHub
Stuart Henderson said: > On 2016/04/21 10:06, Dmitrij D. Czarkoff wrote: >> Michael McConville said: >>> Dmitrij D. Czarkoff wrote: Michael McConville said: > +GH_ACCOUNT = libfuse > +GH_PROJECT = sshfs You don't need these any more. >>> >>> Don't we need them for HOMEPAGE? It uses the explicitly set MASTER_SITES >>> in its current form, too, so we don't need to worry about GH_* >>> overwriting that. >> >> Why don't you set HOMEPAGE explicitly then? >> >> Also, CONFIGURE_STYLE=gnu would be enough here. > > And it changes the package name from sshfs-fuse to just sshfs. This diff sets PKGNAME and uses explicit HOMEPAGE. OK? P.S.: sshfs does not recognize "-F" option, which is a major annoyance. -- Dmitrij D. Czarkoff
Re: update sysutils/sshfs-fuse, move to GitHub
On 2016/04/21 10:06, Dmitrij D. Czarkoff wrote: > Michael McConville said: > > Dmitrij D. Czarkoff wrote: > > > Michael McConville said: > > > > +GH_ACCOUNT = libfuse > > > > +GH_PROJECT = sshfs > > > > > > You don't need these any more. > > > > Don't we need them for HOMEPAGE? It uses the explicitly set MASTER_SITES > > in its current form, too, so we don't need to worry about GH_* > > overwriting that. > > Why don't you set HOMEPAGE explicitly then? > > Also, CONFIGURE_STYLE=gnu would be enough here. And it changes the package name from sshfs-fuse to just sshfs.
Re: update sysutils/sshfs-fuse, move to GitHub
Michael McConville said: > Dmitrij D. Czarkoff wrote: > > Michael McConville said: > > > +GH_ACCOUNT = libfuse > > > +GH_PROJECT = sshfs > > > > You don't need these any more. > > Don't we need them for HOMEPAGE? It uses the explicitly set MASTER_SITES > in its current form, too, so we don't need to worry about GH_* > overwriting that. Why don't you set HOMEPAGE explicitly then? Also, CONFIGURE_STYLE=gnu would be enough here. -- Dmitrij D. Czarkoff
Re: update sysutils/sshfs-fuse, move to GitHub
Dmitrij D. Czarkoff wrote: > Michael McConville said: > > +GH_ACCOUNT = libfuse > > +GH_PROJECT = sshfs > > You don't need these any more. Don't we need them for HOMEPAGE? It uses the explicitly set MASTER_SITES in its current form, too, so we don't need to worry about GH_* overwriting that.
Re: update sysutils/sshfs-fuse, move to GitHub
Michael McConville said: > +GH_ACCOUNT = libfuse > +GH_PROJECT = sshfs You don't need these any more. -- Dmitrij D. Czarkoff
Re: update sysutils/sshfs-fuse, move to GitHub
Michael McConville wrote: > Stuart Henderson wrote: > > On 2016/04/15 12:58, Michael McConville wrote: > > > +GH_ACCOUNT = libfuse > > > +GH_PROJECT = sshfs > > > +GH_TAGNAME = sshfs-${V} > > > > Please use the proper uploaded release tarball > > > > DISTNAME = sshfs-2.7 > > MASTER_SITES = > > https://github.com/libfuse/sshfs/releases/download/${DISTNAME}/ > > > > and get rid of the roll-your-own-autoconf mess. > > Thanks for the input. Does this look better? I got a chance to test this, and it works for me. > Index: Makefile > === > RCS file: /cvs/ports/sysutils/sshfs-fuse/Makefile,v > retrieving revision 1.5 > diff -u -p -u -r1.5 Makefile > --- Makefile 25 Sep 2015 07:17:57 - 1.5 > +++ Makefile 16 Apr 2016 04:55:12 - > @@ -2,11 +2,13 @@ > > COMMENT =mount remote directories over ssh > > -DISTNAME = sshfs-fuse-2.5 > +DISTNAME = sshfs-2.7 > CATEGORIES = sysutils > > -HOMEPAGE = http://fuse.sourceforge.net/sshfs.html > -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fuse/} > +GH_ACCOUNT = libfuse > +GH_PROJECT = sshfs > + > +MASTER_SITES = > https://github.com/libfuse/sshfs/releases/download/${DISTNAME}/ > > MAINTAINER = Gallon Sylvestre > > @@ -17,7 +19,8 @@ WANTLIB += c fuse glib-2.0 gthread-2.0 p > > MODULES= devel/gettext > > -CONFIGURE_STYLE =gnu > +CONFIGURE_STYLE =autoconf automake > +AUTOCONF_VERSION = 2.69 > > LIB_DEPENDS =devel/glib2 > > Index: distinfo > === > RCS file: /cvs/ports/sysutils/sshfs-fuse/distinfo,v > retrieving revision 1.2 > diff -u -p -u -r1.2 distinfo > --- distinfo 25 Sep 2015 07:17:57 - 1.2 > +++ distinfo 16 Apr 2016 04:55:12 - > @@ -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 -u -r1.3 patch-sshfs_c > --- patches/patch-sshfs_c 25 Sep 2015 07:17:57 - 1.3 > +++ patches/patch-sshfs_c 16 Apr 2016 04:55:12 - > @@ -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 > #include > -#include > - #include > - #include > - #include > -@@ -32,6 +31,7 @@ > + #ifdef __APPLE__ > + # include > + #endif > +@@ -37,6 +36,7 @@ > #include > #include > #include > @@ -17,7 +17,7 @@ $OpenBSD: patch-sshfs_c,v 1.3 2015/09/25 > #include > #include > #include > -@@ -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; >
Re: update sysutils/sshfs-fuse, move to GitHub
Stuart Henderson wrote: > On 2016/04/15 12:58, Michael McConville wrote: > > +GH_ACCOUNT = libfuse > > +GH_PROJECT = sshfs > > +GH_TAGNAME = sshfs-${V} > > Please use the proper uploaded release tarball > > DISTNAME =sshfs-2.7 > MASTER_SITES = > https://github.com/libfuse/sshfs/releases/download/${DISTNAME}/ > > and get rid of the roll-your-own-autoconf mess. Thanks for the input. Does this look better? Index: Makefile === RCS file: /cvs/ports/sysutils/sshfs-fuse/Makefile,v retrieving revision 1.5 diff -u -p -u -r1.5 Makefile --- Makefile25 Sep 2015 07:17:57 - 1.5 +++ Makefile16 Apr 2016 04:55:12 - @@ -2,11 +2,13 @@ COMMENT = mount remote directories over ssh -DISTNAME = sshfs-fuse-2.5 +DISTNAME = sshfs-2.7 CATEGORIES = sysutils -HOMEPAGE = http://fuse.sourceforge.net/sshfs.html -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fuse/} +GH_ACCOUNT = libfuse +GH_PROJECT = sshfs + +MASTER_SITES = https://github.com/libfuse/sshfs/releases/download/${DISTNAME}/ MAINTAINER = Gallon Sylvestre @@ -17,7 +19,8 @@ WANTLIB += c fuse glib-2.0 gthread-2.0 p MODULES= devel/gettext -CONFIGURE_STYLE = gnu +CONFIGURE_STYLE = autoconf automake +AUTOCONF_VERSION = 2.69 LIB_DEPENDS = devel/glib2 Index: distinfo === RCS file: /cvs/ports/sysutils/sshfs-fuse/distinfo,v retrieving revision 1.2 diff -u -p -u -r1.2 distinfo --- distinfo25 Sep 2015 07:17:57 - 1.2 +++ distinfo16 Apr 2016 04:55:12 - @@ -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 -u -r1.3 patch-sshfs_c --- patches/patch-sshfs_c 25 Sep 2015 07:17:57 - 1.3 +++ patches/patch-sshfs_c 16 Apr 2016 04:55:12 - @@ -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.cFri Sep 25 09:16:48 2015 +--- sshfs.c.orig Tue Mar 1 11:49:53 2016 sshfs.cFri Apr 15 12:51:26 2016 @@ -11,7 +11,6 @@ #include #include -#include - #include - #include - #include -@@ -32,6 +31,7 @@ + #ifdef __APPLE__ + # include + #endif +@@ -37,6 +36,7 @@ #include #include #include @@ -17,7 +17,7 @@ $OpenBSD: patch-sshfs_c,v 1.3 2015/09/25 #include #include #include -@@ -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;
Re: update sysutils/sshfs-fuse, move to GitHub
On 2016/04/15 12:58, Michael McConville wrote: > +GH_ACCOUNT = libfuse > +GH_PROJECT = sshfs > +GH_TAGNAME = sshfs-${V} Please use the proper uploaded release tarball DISTNAME = sshfs-2.7 MASTER_SITES = https://github.com/libfuse/sshfs/releases/download/${DISTNAME}/ and get rid of the roll-your-own-autoconf mess.
update sysutils/sshfs-fuse, move to GitHub
Does anyone who uses sshfs-fuse want to test this? It seems like an interesting tool and I'm planning on trying it, but I haven't previously and therefore might not notice regressions. Index: Makefile === RCS file: /cvs/ports/sysutils/sshfs-fuse/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- Makefile25 Sep 2015 07:17:57 - 1.5 +++ Makefile15 Apr 2016 16:57:32 - @@ -2,11 +2,13 @@ COMMENT = mount remote directories over ssh -DISTNAME = sshfs-fuse-2.5 +V =2.7 +DISTNAME = sshfs-fuse-${V} CATEGORIES = sysutils -HOMEPAGE = http://fuse.sourceforge.net/sshfs.html -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fuse/} +GH_ACCOUNT = libfuse +GH_PROJECT = sshfs +GH_TAGNAME = sshfs-${V} MAINTAINER = Gallon Sylvestre @@ -17,8 +19,16 @@ WANTLIB += c fuse glib-2.0 gthread-2.0 p MODULES= devel/gettext -CONFIGURE_STYLE = gnu +CONFIGURE_STYLE = autoconf automake LIB_DEPENDS = devel/glib2 +BUILD_DEPENDS =devel/libtool + +post-patch: + @cd ${WRKSRC}; AUTOMAKE_VERSION=${AUTOMAKE_VERSION} aclocal + +pre-configure: + @cd ${WRKSRC}; AUTOMAKE_VERSION=${AUTOMAKE_VERSION} automake \ + --foreign --add-missing --copy .include Index: distinfo === RCS file: /cvs/ports/sysutils/sshfs-fuse/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo25 Sep 2015 07:17:57 - 1.2 +++ distinfo15 Apr 2016 16:57:32 - @@ -1,2 +1,2 @@ -SHA256 (sshfs-fuse-2.5.tar.gz) = 6RcUUuXQFQucaiFY/S4tzvtdXQO6TSCJSeAKOkbG5j4= -SIZE (sshfs-fuse-2.5.tar.gz) = 136378 +SHA256 (sshfs-fuse-2.7.tar.gz) = aoKxw352v3DviKUCTVvyTebo2YNi2bv18By+3WPVMwc= +SIZE (sshfs-fuse-2.7.tar.gz) = 50642 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 - 1.3 +++ patches/patch-sshfs_c 15 Apr 2016 16:57:32 - @@ -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.cFri Sep 25 09:16:48 2015 +--- sshfs.c.orig Tue Mar 1 11:49:53 2016 sshfs.cFri Apr 15 12:51:26 2016 @@ -11,7 +11,6 @@ #include #include -#include - #include - #include - #include -@@ -32,6 +31,7 @@ + #ifdef __APPLE__ + # include + #endif +@@ -37,6 +36,7 @@ #include #include #include @@ -17,7 +17,7 @@ $OpenBSD: patch-sshfs_c,v 1.3 2015/09/25 #include #include #include -@@ -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;