Bug 174606
| Summary: | [patch] sysutils/fusefs-curlftpfs: for 9.1R | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | arai.toshihiko | ||||
| Component: | Individual Port(s) | Assignee: | William Grzybowski <wg> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Only Me | ||||||
| Priority: | Normal | ||||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
|
Description
arai.toshihiko
2012-12-21 10:40:00 UTC
Responsible Changed From-To: freebsd-ports-bugs->dhn Over to maintainer (via the GNATS Auto Assign Tool) Responsible Changed From-To: dhn->wg I'll take it. State Changed From-To: open->closed Committed. Thanks! Author: wg Date: Sat Jun 15 13:39:39 2013 New Revision: 320997 URL: http://svnweb.freebsd.org/changeset/ports/320997 Log: sysutils/fusefs-curlftpfs: unbreak build - Unbreak build for FreeBSD >= 9 [1] - Add LICENSE (GPLv2) PR: ports/174606 [1] Submitted by: ARAI Toshihiko <arai.toshihiko@gmail.com> Approved by: culot / jpaetzel (mentors, implicit), maintainer (timeout) Added: head/sysutils/fusefs-curlftpfs/files/extra-32-ftpfs.h (contents, props changed) head/sysutils/fusefs-curlftpfs/files/extra-64-ftpfs.h (contents, props changed) head/sysutils/fusefs-curlftpfs/files/extra-patch-ftpfs.c (contents, props changed) Deleted: head/sysutils/fusefs-curlftpfs/files/patch-ftpfs.c Modified: head/sysutils/fusefs-curlftpfs/Makefile Modified: head/sysutils/fusefs-curlftpfs/Makefile ============================================================================== --- head/sysutils/fusefs-curlftpfs/Makefile Sat Jun 15 13:30:13 2013 (r320996) +++ head/sysutils/fusefs-curlftpfs/Makefile Sat Jun 15 13:39:39 2013 (r320997) @@ -11,6 +11,8 @@ PKGNAMEPREFIX= fusefs- MAINTAINER= dhn@FreeBSD.org COMMENT= Mount remote ftp directories +LICENSE= GPLv2 + LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl GNU_CONFIGURE= yes @@ -21,8 +23,13 @@ PLIST_FILES= bin/curlftpfs .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 900000 -BROKEN= does not build +.if ${OSVERSION} >= 1000000 +EXTRA_PATCHES+= ${FILESDIR}/extra-64-ftpfs.h +.else +EXTRA_PATCHES+= ${FILESDIR}/extra-32-ftpfs.h +.endif +.if ${OSVERSION} < 900000 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-ftpfs.c .endif -.include <bsd.port.post.mk> +.include <bsd.port.post.mk> Added: head/sysutils/fusefs-curlftpfs/files/extra-32-ftpfs.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/fusefs-curlftpfs/files/extra-32-ftpfs.h Sat Jun 15 13:39:39 2013 (r320997) @@ -0,0 +1,11 @@ +--- ftpfs.h.orig 2008-04-25 19:32:30.000000000 +0900 ++++ ftpfs.h 2012-12-21 18:18:20.000000000 +0900 +@@ -75,7 +75,7 @@ + do { if (level <= ftpfs.debug) {\ + int i = 0; \ + while (++i < level) fprintf(stderr, " "); \ +- fprintf(stderr, "%ld ", time(NULL));\ ++ fprintf(stderr, "%d ", time(NULL));\ + fprintf(stderr, __FILE__ ":%d ", __LINE__);\ + fprintf(stderr, args);\ + }\ Added: head/sysutils/fusefs-curlftpfs/files/extra-64-ftpfs.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/fusefs-curlftpfs/files/extra-64-ftpfs.h Sat Jun 15 13:39:39 2013 (r320997) @@ -0,0 +1,11 @@ +--- ftpfs.h.orig 2008-04-25 19:32:30.000000000 +0900 ++++ ftpfs.h 2012-12-21 18:18:20.000000000 +0900 +@@ -75,7 +75,7 @@ + do { if (level <= ftpfs.debug) {\ + int i = 0; \ + while (++i < level) fprintf(stderr, " "); \ +- fprintf(stderr, "%ld ", time(NULL));\ ++ fprintf(stderr, "%lld ", time(NULL));\ + fprintf(stderr, __FILE__ ":%d ", __LINE__);\ + fprintf(stderr, args);\ + }\ Added: head/sysutils/fusefs-curlftpfs/files/extra-patch-ftpfs.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/fusefs-curlftpfs/files/extra-patch-ftpfs.c Sat Jun 15 13:39:39 2013 (r320997) @@ -0,0 +1,19 @@ +--- ./ftpfs.c.orig 2008-04-30 01:05:47.000000000 +0200 ++++ ./ftpfs.c 2010-01-08 19:14:39.000000000 +0100 +@@ -611,10 +611,12 @@ + curl_easy_cleanup(fh->write_conn); + g_free(fh->full_path); + g_free(fh->open_path); +- sem_destroy(&fh->data_avail); +- sem_destroy(&fh->data_need); +- sem_destroy(&fh->data_written); +- sem_destroy(&fh->ready); ++ if (fh->data_avail) { ++ sem_destroy(&fh->data_avail); ++ sem_destroy(&fh->data_need); ++ sem_destroy(&fh->data_written); ++ sem_destroy(&fh->ready); ++ } + free(fh); + } + _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" |
