From owner-svn-ports-all@FreeBSD.ORG Sat Jun 15 13:39:40 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id EF37BF8B; Sat, 15 Jun 2013 13:39:40 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E205B183C; Sat, 15 Jun 2013 13:39:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5FDdebo089211; Sat, 15 Jun 2013 13:39:40 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5FDdeD8089205; Sat, 15 Jun 2013 13:39:40 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201306151339.r5FDdeD8089205@svn.freebsd.org> From: William Grzybowski Date: Sat, 15 Jun 2013 13:39:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320997 - in head/sysutils/fusefs-curlftpfs: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Jun 2013 13:39:41 -0000 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 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 -.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 +.include 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); + } +