Date: Tue, 19 Feb 2013 17:37:18 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312594 - in head/sysutils/fusefs-httpfs: . files Message-ID: <201302191737.r1JHbIlr023387@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Tue Feb 19 17:37:17 2013 New Revision: 312594 URL: http://svnweb.freebsd.org/changeset/ports/312594 Log: - Update to httpfs2 0.1.5 (PORTVERSION: 2.0.1.5) Added: head/sysutils/fusefs-httpfs/files/patch-Makefile (contents, props changed) head/sysutils/fusefs-httpfs/files/patch-httpfs2.c (contents, props changed) Deleted: head/sysutils/fusefs-httpfs/files/patch-httpfs.c Modified: head/sysutils/fusefs-httpfs/Makefile head/sysutils/fusefs-httpfs/distinfo (contents, props changed) Modified: head/sysutils/fusefs-httpfs/Makefile ============================================================================== --- head/sysutils/fusefs-httpfs/Makefile Tue Feb 19 17:36:55 2013 (r312593) +++ head/sysutils/fusefs-httpfs/Makefile Tue Feb 19 17:37:17 2013 (r312594) @@ -1,32 +1,27 @@ -# New ports collection makefile for: fusefs-httpfs -# Date created: 2006-07-16 -# Whom: Gea-Suan Lin <gslin@gslin.org> -# +# Created by: Gea-Suan Lin <gslin@gslin.org> # $FreeBSD$ -# PORTNAME= httpfs -PORTVERSION= 2.06.08.26 +PORTVERSION= 2.${VERSION} 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@FreeBSD.org COMMENT= Fuse-based http filesystem -USE_FUSE= yes -PLIST_FILES= bin/httpfs -WRKSRC= ${WRKDIR} +WRKSRC= ${WRKDIR}/${PORTNAME}2-${VERSION} -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) +VERSION= 0.1.5 +USE_FUSE= yes +USE_PKGCONFIG= yes +USE_GMAKE= yes +CFLAGS+= -D__BSD_VISIBLE +ALL_TARGET= httpfs2 +PLIST_FILES= bin/httpfs2 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/httpfs ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/httpfs2 ${PREFIX}/bin .include <bsd.port.mk> Modified: head/sysutils/fusefs-httpfs/distinfo ============================================================================== --- head/sysutils/fusefs-httpfs/distinfo Tue Feb 19 17:36:55 2013 (r312593) +++ head/sysutils/fusefs-httpfs/distinfo Tue Feb 19 17:37:17 2013 (r312594) @@ -1,2 +1,2 @@ -SHA256 (httpfs_with_static_binaries_2.06.08.26.tar.gz) = b34d23d9e67b3e7931b2c0dc53fd997dcaf3d6b2126f87a25b51dd00c25e4e65 -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: head/sysutils/fusefs-httpfs/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/fusefs-httpfs/files/patch-Makefile Tue Feb 19 17:37:17 2013 (r312594) @@ -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) + Added: head/sysutils/fusefs-httpfs/files/patch-httpfs2.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/fusefs-httpfs/files/patch-httpfs2.c Tue Feb 19 17:37:17 2013 (r312594) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302191737.r1JHbIlr023387>