summaryrefslogtreecommitdiff
path: root/sysutils/fusefs-curlftpfs
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2017-04-10 15:50:23 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2017-04-10 15:50:23 +0000
commite385730f9c4538176f514dac5d02b064e6c4cc14 (patch)
treef73a32395c5e22742edc35e70e75f24055996be9 /sysutils/fusefs-curlftpfs
parent- Remove obsolete OSVERSION condition (diff)
- Add LICENSE_FILE
- Remove always true OSVERSION condition, make patch unconditional Approved by: portmgr blanket
Notes
Notes: svn path=/head/; revision=438184
Diffstat (limited to 'sysutils/fusefs-curlftpfs')
-rw-r--r--sysutils/fusefs-curlftpfs/Makefile11
-rw-r--r--sysutils/fusefs-curlftpfs/files/extra-32-ftpfs.h11
-rw-r--r--sysutils/fusefs-curlftpfs/files/patch-ftpfs.h (renamed from sysutils/fusefs-curlftpfs/files/extra-64-ftpfs.h)6
3 files changed, 5 insertions, 23 deletions
diff --git a/sysutils/fusefs-curlftpfs/Makefile b/sysutils/fusefs-curlftpfs/Makefile
index 884641284e55..6ce785309ac6 100644
--- a/sysutils/fusefs-curlftpfs/Makefile
+++ b/sysutils/fusefs-curlftpfs/Makefile
@@ -12,6 +12,7 @@ MAINTAINER= rodrigo@FreeBSD.org
COMMENT= Mount remote ftp directories
LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libcurl.so:ftp/curl
@@ -20,12 +21,4 @@ USES= fuse pkgconfig
USE_GNOME= glib20
PLIST_FILES= bin/curlftpfs man/man1/${PORTNAME}.1.gz
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 1000000
-EXTRA_PATCHES+= ${FILESDIR}/extra-64-ftpfs.h
-.else
-EXTRA_PATCHES+= ${FILESDIR}/extra-32-ftpfs.h
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/fusefs-curlftpfs/files/extra-32-ftpfs.h b/sysutils/fusefs-curlftpfs/files/extra-32-ftpfs.h
deleted file mode 100644
index 6fc7b5f4f862..000000000000
--- a/sysutils/fusefs-curlftpfs/files/extra-32-ftpfs.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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);\
- }\
diff --git a/sysutils/fusefs-curlftpfs/files/extra-64-ftpfs.h b/sysutils/fusefs-curlftpfs/files/patch-ftpfs.h
index bb9dd7609ed1..1f577d3af78a 100644
--- a/sysutils/fusefs-curlftpfs/files/extra-64-ftpfs.h
+++ b/sysutils/fusefs-curlftpfs/files/patch-ftpfs.h
@@ -1,6 +1,6 @@
---- 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 @@
+--- ftpfs.h.orig 2008-04-25 10:32:30 UTC
++++ ftpfs.h
+@@ -75,7 +75,7 @@ extern struct ftpfs ftpfs;
do { if (level <= ftpfs.debug) {\
int i = 0; \
while (++i < level) fprintf(stderr, " "); \