[Midnightbsd-cvs] mports [21004] trunk/sysutils/fusefs-httpfs: update fuse http file system
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Feb 5 14:10:00 EST 2016
Revision: 21004
http://svnweb.midnightbsd.org/mports/?rev=21004
Author: laffer1
Date: 2016-02-05 14:09:59 -0500 (Fri, 05 Feb 2016)
Log Message:
-----------
update fuse http file system
Modified Paths:
--------------
trunk/sysutils/fusefs-httpfs/Makefile
trunk/sysutils/fusefs-httpfs/distinfo
trunk/sysutils/fusefs-httpfs/pkg-descr
Added Paths:
-----------
trunk/sysutils/fusefs-httpfs/files/patch-Makefile
trunk/sysutils/fusefs-httpfs/files/patch-httpfs2.c
Removed Paths:
-------------
trunk/sysutils/fusefs-httpfs/files/patch-httpfs.c
Modified: trunk/sysutils/fusefs-httpfs/Makefile
===================================================================
--- trunk/sysutils/fusefs-httpfs/Makefile 2016-02-05 16:56:01 UTC (rev 21003)
+++ trunk/sysutils/fusefs-httpfs/Makefile 2016-02-05 19:09:59 UTC (rev 21004)
@@ -1,33 +1,26 @@
# $MidnightBSD$
PORTNAME= httpfs
-PORTVERSION= 2.06.08.26
-PORTREVISION= 1
+PORTVERSION= 2.${VERSION}
+PORTEPOCH= 1
CATEGORIES= sysutils www
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_with_static_binaries_${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}2/
PKGNAMEPREFIX= fusefs-
-DISTNAME= ${PORTNAME}_with_static_binaries_${PORTVERSION}
+DISTNAME= ${PORTNAME}2-${VERSION}
MAINTAINER= ports at MidnightBSD.org
COMMENT= Fuse-based http filesystem
LICENSE= gpl2
-USE_ICONV= yes
+WRKSRC= ${WRKDIR}/${PORTNAME}2-${VERSION}
-RUN_DEPENDS= ${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
-BUILD_DEPENDS= ${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
+VERSION= 0.1.5
+USES= fuse pkgconfig gmake
+CFLAGS+= -D__BSD_VISIBLE
+ALL_TARGET= httpfs2
+PLIST_FILES= bin/httpfs2
-PLIST_FILES= bin/httpfs
-WRKSRC= ${WRKDIR}
-
-do-build:
- (cd ${WRKSRC} && ${CC} ${CFLAGS} -I${LOCALBASE}/include/fuse \
- -DUSE_AUTH -D_FILE_OFFSET_BITS=64 -D_REENTRANT \
- -DFUSE_USE_VERSION=25 -D_POSIX_C_SOURCE=200112L -D_POSIX_SOURCE \
- -D_SVID_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=500 \
- -o httpfs httpfs.c -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lfuse -liconv)
-
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/httpfs ${TARGETDIR}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/httpfs2 ${STAGEDIR}${PREFIX}/bin
.include <bsd.port.mk>
Modified: trunk/sysutils/fusefs-httpfs/distinfo
===================================================================
--- trunk/sysutils/fusefs-httpfs/distinfo 2016-02-05 16:56:01 UTC (rev 21003)
+++ trunk/sysutils/fusefs-httpfs/distinfo 2016-02-05 19:09:59 UTC (rev 21004)
@@ -1,3 +1,2 @@
-SHA256 (httpfs_with_static_binaries_2.06.08.26.tar.gz) = b34d23d9e67b3e7931b2c0dc53fd997dcaf3d6b2126f87a25b51dd00c25e4e65
-RMD160 (httpfs_with_static_binaries_2.06.08.26.tar.gz) = 0172c155d38b0ee2e862fdcf8815886ed7d28e48
-SIZE (httpfs_with_static_binaries_2.06.08.26.tar.gz) = 115384
+SHA256 (httpfs2-0.1.5.tar.gz) = 01cb4bb38deb344f540da6f1464dc7edbdeb51213ad810b8c9c282c1e17e0fc1
+SIZE (httpfs2-0.1.5.tar.gz) = 16870
Added: trunk/sysutils/fusefs-httpfs/files/patch-Makefile
===================================================================
--- trunk/sysutils/fusefs-httpfs/files/patch-Makefile (rev 0)
+++ trunk/sysutils/fusefs-httpfs/files/patch-Makefile 2016-02-05 19:09:59 UTC (rev 21004)
@@ -0,0 +1,39 @@
+--- Makefile.orig 2012-09-03 16:58:02.000000000 +0200
++++ Makefile 2013-02-19 18:03:41.000000000 +0100
+@@ -1,5 +1,5 @@
+ MAIN_CFLAGS := -g -Os -Wall $(shell pkg-config fuse --cflags)
+-MAIN_CPPFLAGS := -Wall -Wno-unused-function -Wconversion -Wtype-limits -DUSE_AUTH -D_XOPEN_SOURCE=700 -D_ISOC99_SOURCE
++MAIN_CPPFLAGS := -Wall -Wno-unused-function -Wconversion -DUSE_AUTH -D_XOPEN_SOURCE=700 -D_ISOC99_SOURCE
+ THR_CPPFLAGS := -DUSE_THREAD
+ THR_LDFLAGS := -lpthread
+ MAIN_LDFLAGS := $(shell pkg-config fuse --libs | sed -e s/-lrt// -e s/-ldl// -e s/-pthread// -e "s/ / /g")
+@@ -45,7 +45,7 @@
+ $(MAKE) $* $(addprefix $*,$(variants))
+
+ %.1: %.1.txt
+- a2x -f manpage $<
++ a2x -L -f manpage $<
+
+ %-ssl: $*
+ $(MAKE) CPPFLAGS='$(CPPFLAGS) $(SSL_CPPFLAGS)' LDFLAGS='$(LDFLAGS) $(SSL_LDFLAGS)' binsuffix=-ssl$(binsuffix) $*
+@@ -61,20 +61,6 @@
+
+ # Rules to automatically make a Debian package
+
+-package = $(shell dpkg-parsechangelog | grep ^Source: | sed -e s,'^Source: ',,)
+-version = $(shell dpkg-parsechangelog | grep ^Version: | sed -e s,'^Version: ',, -e 's,-.*,,')
+-revision = $(shell dpkg-parsechangelog | grep ^Version: | sed -e -e 's,.*-,,')
+-architecture = $(shell dpkg --print-architecture)
+-tar_dir = $(package)-$(version)
+-tar_gz = $(tar_dir).tar.gz
+-pkg_deb_dir = pkgdeb
+-unpack_dir = $(pkg_deb_dir)/$(tar_dir)
+-orig_tar_gz = $(pkg_deb_dir)/$(package)_$(version).orig.tar.gz
+-pkg_deb_src = $(pkg_deb_dir)/$(package)_$(version)-$(revision)_source.changes
+-pkg_deb_bin = $(pkg_deb_dir)/$(package)_$(version)-$(revision)_$(architecture).changes
+-
+-deb_pkg_key = CB8C5858
+-
+ debclean:
+ rm -rf $(pkg_deb_dir)
+
Property changes on: trunk/sysutils/fusefs-httpfs/files/patch-Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/sysutils/fusefs-httpfs/files/patch-httpfs.c
===================================================================
--- trunk/sysutils/fusefs-httpfs/files/patch-httpfs.c 2016-02-05 16:56:01 UTC (rev 21003)
+++ trunk/sysutils/fusefs-httpfs/files/patch-httpfs.c 2016-02-05 19:09:59 UTC (rev 21004)
@@ -1,14 +0,0 @@
---- httpfs.c.orig Sun Jul 16 22:48:19 2006
-+++ httpfs.c Sun Jul 16 22:48:39 2006
-@@ -32,9 +32,10 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <sys/stat.h>
--#include <sys/dir.h>
-+#include <dirent.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <sys/select.h>
- #include <netinet/in.h>
- #include <netdb.h>
- #include <time.h>
Added: trunk/sysutils/fusefs-httpfs/files/patch-httpfs2.c
===================================================================
--- trunk/sysutils/fusefs-httpfs/files/patch-httpfs2.c (rev 0)
+++ trunk/sysutils/fusefs-httpfs/files/patch-httpfs2.c 2016-02-05 19:09:59 UTC (rev 21004)
@@ -0,0 +1,38 @@
+--- httpfs2.c.orig 2013-02-19 15:45:06.000000000 +0100
++++ httpfs2.c 2013-02-19 15:48:43.000000000 +0100
+@@ -35,7 +35,7 @@
+ #include <assert.h>
+ #include <ctype.h>
+ #include <sys/stat.h>
+-#include <sys/dir.h>
++#include <dirent.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/socket.h>
+@@ -188,7 +188,7 @@
+
+ static int httpfs_stat(fuse_ino_t ino, struct stat *stbuf)
+ {
+- stbuf->st_ino = ino;
++ stbuf->st_ino = (uint32_t)ino;
+ switch (ino) {
+ case 1:
+ stbuf->st_mode = S_IFDIR | 0755;
+@@ -257,7 +257,7 @@
+ b->size += fuse_add_direntry(req, NULL, 0, name, NULL, 0);
+ b->p = (char *) realloc(b->p, b->size);
+ memset(&stbuf, 0, sizeof(stbuf));
+- stbuf.st_ino = ino;
++ stbuf.st_ino = (uint32_t)ino;
+ fuse_add_direntry(req, b->p + oldsize, b->size - oldsize, name, &stbuf,
+ (off_t) b->size);
+ }
+@@ -667,7 +667,7 @@
+
+ static int init_url(struct_url* url)
+ {
+- memset(url, 0, sizeof(url));
++ memset(url, 0, sizeof(*url));
+ url->sock_type = SOCK_CLOSED;
+ url->timeout = TIMEOUT;
+ #ifdef USE_SSL
Property changes on: trunk/sysutils/fusefs-httpfs/files/patch-httpfs2.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/sysutils/fusefs-httpfs/pkg-descr
===================================================================
--- trunk/sysutils/fusefs-httpfs/pkg-descr 2016-02-05 16:56:01 UTC (rev 21003)
+++ trunk/sysutils/fusefs-httpfs/pkg-descr 2016-02-05 19:09:59 UTC (rev 21004)
@@ -3,4 +3,4 @@
an iso, since it can be investigated (loop device) without actually
downloading the whole iso.
-WWW: http://httpfs.sourceforge.net/
+WWW: http://httpfs.sourceforge.net/
More information about the Midnightbsd-cvs
mailing list