Index: head/sysutils/fusefs-sqlfs/Makefile =================================================================== --- head/sysutils/fusefs-sqlfs/Makefile (revision 431936) +++ head/sysutils/fusefs-sqlfs/Makefile (revision 431937) @@ -1,37 +1,40 @@ # Created by: Stanislav Sedov # $FreeBSD$ PORTNAME= sqlfs PORTVERSION= 1.1 PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= sysutils MASTER_SITES= SAVANNAH/libsqlfs PKGNAMEPREFIX= fusefs- DISTNAME= lib${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= SQLite backed FUSE file system +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/COPYING + USES= fuse sqlite -OPTIONS_DEFINE= DOCS - PORTDOCS= README - PLIST_FILES= bin/sqlfs +OPTIONS_DEFINE= DOCS + do-build: (cd ${WRKSRC} && ${CC} -DFUSE -DFUSE_USE_VERSION=25 \ -D_FILE_OFFSET_BITS=64 -D_REENTRANT ${CFLAGS} \ - -I${LOCALBASE}/include -I. -L${LOCALBASE}/lib \ + -I. -I${LOCALBASE}/include -L${LOCALBASE}/lib \ -lfuse -lsqlite${SQLITE_VER} sqlfs.c fuse_main.c \ -o sqlfs) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sqlfs ${STAGEDIR}${PREFIX}/bin +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include Index: head/sysutils/fusefs-sqlfs/files/patch-fuse_main.c =================================================================== --- head/sysutils/fusefs-sqlfs/files/patch-fuse_main.c (revision 431936) +++ head/sysutils/fusefs-sqlfs/files/patch-fuse_main.c (revision 431937) @@ -1,65 +1,65 @@ ---- fuse_main.c.orig Wed Oct 25 19:28:26 2006 -+++ fuse_main.c Wed Feb 7 21:34:03 2007 -@@ -17,12 +17,60 @@ +--- fuse_main.c.orig 2006-10-25 15:28:26 UTC ++++ fuse_main.c +@@ -17,12 +17,60 @@ Foundation, Inc., 51 Franklin Street, Fi *****************************************************************************/ +#include +#include +#include #include "sqlfs.h" +void usage() __dead2; + +void usage() +{ + fprintf(stderr, "Usage: %s -o dbname [-h] dir\n", getprogname()); + + exit(EX_USAGE); +} int main(int argc, char **argv) { - sqlfs_init("/tmp/fsdata"); + char c; + int ret; + char *dbname = NULL; + char *args[2]; + char *prog = argv[0]; + + while ((c = getopt(argc, argv, "o:h")) != -1) + switch (c) { + case 'o': + dbname = strdup(optarg); + break; + case 'h': + /* FALLTHROUGH */ + default: + usage(); + /* NOTREACHED */ + } + argc -= optind; + argv += optind; + + if (dbname == NULL) { + dbname = getenv("SQLFS_DBNAME"); + } + + if (dbname == NULL || argc < 1) + usage(); + /* NOTREACHED */ + + ret = sqlfs_init(dbname); + if (ret != 0) + return ret; + + fprintf(stderr, "init\n"); + + args[0] = strdup(getprogname()); + args[1] = strdup(argv[0]); - return sqlfs_fuse_main(argc, argv); + ret = sqlfs_fuse_main(2, args); + + return ret; }