View | Details | Raw Unified | Return to bug 245805 | Differences between
and this patch

Collapse All | Expand All

(-)b/net/onedrive/Makefile (-31 / +14 lines)
Lines 2-63 Link Here
2
2
3
PORTNAME=	onedrive
3
PORTNAME=	onedrive
4
DISTVERSIONPREFIX=	v
4
DISTVERSIONPREFIX=	v
5
DISTVERSION=	2.3.3
5
DISTVERSION=	2.4.0
6
PORTREVISION=	1
7
CATEGORIES=	net
6
CATEGORIES=	net
8
7
9
MAINTAINER=	hiroo.ono+freebsd@gmail.com
8
MAINTAINER=	hiroo.ono+freebsd@gmail.com
10
COMMENT=	OneDrive Free client
9
COMMENT=	OneDrive Free client
11
10
12
LICENSE=	GPLv3
11
LICENSE=	GPLv3
12
LICENSE_FILE=	${WRKSRC}/LICENSE
13
13
14
LIB_DEPENDS=	libcurl.so:ftp/curl \
14
LIB_DEPENDS=	libcurl.so:ftp/curl \
15
		libinotify.so:devel/libinotify
15
		libinotify.so:devel/libinotify
16
BUILD_DEPENDS=	ldc2:lang/ldc
16
BUILD_DEPENDS=	ldc2:lang/ldc
17
RUN_DEPENDS=	${LOCALBASE}/sbin/logrotate:sysutils/logrotate
17
RUN_DEPENDS=	${LOCALBASE}/sbin/logrotate:sysutils/logrotate
18
18
19
USES=		gmake pkgconfig sqlite
19
USES=		autoreconf gmake pkgconfig sqlite
20
USE_GITHUB=	yes
20
USE_GITHUB=	yes
21
GH_ACCOUNT=	abraunegg
21
GH_ACCOUNT=	abraunegg
22
22
23
GNU_CONFIGURE=	yes
23
PKGCONFIG=		pkgconf
24
PKGCONFIG=		pkgconf
24
MAKE_ARGS=		DC=ldc2
25
INSTALL_TARGET=		install.noservice
26
25
27
OPTIONS_DEFINE=		DOCS NOTIFY BASH ZSH
26
OPTIONS_DEFINE=		NOTIFY COMPLETION
28
OPTIONS_DEFAULT=	DOCS NOTIFY BASH ZSH
27
OPTIONS_DEFAULT=	NOTIFY COMPLETION
29
OPTIONS_SUB=		yes
28
OPTIONS_SUB=		yes
30
29
31
DOCFILES=		README.md README.Office365.md config CHANGELOG.md
30
NOTIFY_CONFIGURE_ENABLE=	notifications
32
33
NOTIFY_VARS=		NOTIFICATIONS=1
34
NOTIFY_USES=		gnome
31
NOTIFY_USES=		gnome
35
NOTIFY_USE=		GNOME=glib20
32
NOTIFY_USE=		GNOME=glib20,gdkpixbuf2
36
NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
33
NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
37
34
38
BASH_COMPLETION_DIR=	${LOCALBASE}/share/bash-completion/completions
35
COMPLETION_DESC=	Install completion for BASH and ZSH
39
ZSH_COMPLETION_DIR=	${LOCALBASE}/share/zsh/site-functions
36
COMPLETION_CONFIGURE_ENABLE=	completions
37
38
ONEDRIVE_LOGDIR=	/var/log/${PORTNAME}
40
39
41
post-extract:
40
post-extract:
42
	${CP} ${FILESDIR}/freebsd_inotify.d ${WRKSRC}/src
41
	${CP} ${FILESDIR}/freebsd_inotify.d ${WRKSRC}/src
43
42
44
do-install-DOCS-on:
43
post-install:
45
.for f in ${DOCFILES}
44
	${INSTALL} -d -m 0775 ${STAGEDIR}${ONEDRIVE_LOGDIR}
46
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
47
	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
48
.endfor
49
50
do-install-BASH-on:
51
	@${MKDIR} ${STAGEDIR}${BASH_COMPLETION_DIR}
52
	${INSTALL_DATA} ${WRKSRC}/completions/complete.bash \
53
		${STAGEDIR}${BASH_COMPLETION_DIR}/onedrive
54
55
do-install-ZSH-on:
56
	@${MKDIR} ${STAGEDIR}${ZSH_COMPLETION_DIR}
57
	${INSTALL_DATA} ${WRKSRC}/completions/complete.zsh \
58
		${STAGEDIR}${ZSH_COMPLETION_DIR}/_onedrive
59
60
post-install-DOCS-on:
61
	${INSTALL_MAN} ${WRKSRC}/onedrive.1 ${STAGEDIR}${MANPREFIX}/man/man1
62
45
63
.include <bsd.port.mk>
46
.include <bsd.port.mk>
(-)b/net/onedrive/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1556052070
1
TIMESTAMP = 1587180559
2
SHA256 (abraunegg-onedrive-v2.3.3_GH0.tar.gz) = 9ee4ea4b3ea880f7624761d053bbb09a2465706685e9ed258c50925ff5e32377
2
SHA256 (abraunegg-onedrive-v2.4.0_GH0.tar.gz) = 79575c47e6e90bacff00dad3c2de1e2a4251c74256717889a22c59862c614d3b
3
SIZE (abraunegg-onedrive-v2.3.3_GH0.tar.gz) = 599457
3
SIZE (abraunegg-onedrive-v2.4.0_GH0.tar.gz) = 670382
(-)a/net/onedrive/files/patch-Makefile (-40 lines)
Removed Link Here
1
--- Makefile.orig	2019-04-16 02:18:26 UTC
2
+++ Makefile
3
@@ -7,8 +7,9 @@ gitversion := $(shell if [ -f .git/HEAD ] ; then echo 
4
 
5
 ifeq ($(pkgconfig),1)
6
 LIBS = $(shell pkg-config --libs sqlite3 libcurl)
7
+LIBS += $(shell pkg-config --libs libinotify)
8
 else
9
-LIBS = -lcurl -lsqlite3
10
+LIBS = -lcurl -lsqlite3 -linotify
11
 endif
12
 ifeq ($(notifications),1)
13
 NOTIF_VERSIONS = -version=NoPragma -version=NoGdk -version=Notifications
14
@@ -74,7 +75,8 @@ SOURCES = \
15
 	src/sync.d \
16
 	src/upload.d \
17
 	src/util.d \
18
-	src/progress.d
19
+	src/progress.d \
20
+	src/freebsd_inotify.d
21
 
22
 ifeq ($(notifications),1)
23
 SOURCES += src/notifications/notify.d src/notifications/dnotify.d
24
@@ -90,11 +92,12 @@ onedrive: version $(SOURCES)
25
 
26
 install.noservice: onedrive onedrive.1
27
 	mkdir -p $(DESTDIR)/var/log/onedrive
28
-	chown root.users $(DESTDIR)/var/log/onedrive
29
+	# chown root.users $(DESTDIR)/var/log/onedrive
30
 	chmod 0775 $(DESTDIR)/var/log/onedrive
31
-	install -D onedrive $(DESTDIR)$(PREFIX)/bin/onedrive
32
-	install -D onedrive.1 $(DESTDIR)$(MANDIR)/onedrive.1
33
-	install -D -m 644 logrotate/onedrive.logrotate $(DESTDIR)/etc/logrotate.d/onedrive
34
+	install onedrive $(DESTDIR)$(PREFIX)/bin/onedrive
35
+	# install -D onedrive.1 $(DESTDIR)$(MANDIR)/onedrive.1
36
+	install -d $(DESTDIR)$(PREFIX)/etc/logrotate.d
37
+	install -m 644 logrotate/onedrive.logrotate $(DESTDIR)$(PREFIX)/etc/logrotate.d/onedrive
38
 
39
 install: all install.noservice
40
 	for i in $(DOCFILES) ; do install -D -m 644 $$i $(DESTDIR)$(DOCDIR)/$$i ; done
(-)b/net/onedrive/files/patch-Makefile.in (+61 lines)
Added Link Here
1
--- Makefile.in.orig	2020-04-21 16:35:56.832704000 +0900
2
+++ Makefile.in	2020-04-21 17:48:33.921286000 +0900
3
@@ -25,6 +25,7 @@
4
 curl_LIBS = @curl_LIBS@
5
 sqlite_LIBS = @sqlite_LIBS@
6
 notify_LIBS = @notify_LIBS@
7
+inotify_LIBS = @inotify_LIBS@
8
 COMPLETIONS = @COMPLETIONS@
9
 BASH_COMPLETION_DIR = @BASH_COMPLETION_DIR@
10
 ZSH_COMPLETION_DIR = @ZSH_COMPLETION_DIR@
11
@@ -54,7 +55,7 @@
12
 system_unit_files = contrib/systemd/onedrive@.service
13
 user_unit_files = contrib/systemd/onedrive.service
14
 
15
-DOCFILES = README.md config LICENSE CHANGELOG.md docs/Docker.md docs/INSTALL.md docs/Office365.md docs/USAGE.md
16
+DOCFILES = README.md config CHANGELOG.md docs/Office365.md docs/USAGE.md
17
 
18
 ifneq ("$(wildcard /etc/redhat-release)","")
19
 RHEL = $(shell cat /etc/redhat-release | grep -E "(Red Hat Enterprise Linux Server|CentOS)" | wc -l)
20
@@ -66,6 +67,7 @@
21
 
22
 SOURCES = \
23
 	src/config.d \
24
+	src/freebsd_inotify.d \
25
 	src/itemdb.d \
26
 	src/log.d \
27
 	src/main.d \
28
@@ -101,14 +103,15 @@
29
 	else \
30
 		echo $(version) > version ; \
31
 	fi
32
-	$(DC) $(DCFLAGS) $(addprefix -L,$(curl_LIBS)) $(addprefix -L,$(sqlite_LIBS)) $(addprefix -L,$(notify_LIBS)) -L-ldl $(SOURCES) -of$@
33
+	$(DC) $(DCFLAGS) $(addprefix -L,$(curl_LIBS)) $(addprefix -L,$(sqlite_LIBS)) $(addprefix -L,$(notify_LIBS)) $(addprefix -L,$(inotify_LIBS)) -L-ldl $(SOURCES) -of$@
34
 
35
 install: all
36
-	$(INSTALL) -D onedrive $(DESTDIR)$(bindir)/onedrive
37
-	$(INSTALL) -D onedrive.1 $(DESTDIR)$(mandir)/man1/onedrive.1
38
-	$(INSTALL) -D -m 644 contrib/logrotate/onedrive.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/onedrive
39
+	$(INSTALL) -s onedrive $(DESTDIR)$(bindir)/onedrive
40
+	$(INSTALL) onedrive.1 $(DESTDIR)$(mandir)/man1/onedrive.1
41
+	mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d
42
+	$(INSTALL) -m 644 contrib/logrotate/onedrive.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/onedrive
43
 	mkdir -p $(DESTDIR)$(docdir)
44
-	$(INSTALL) -D -m 644 $(DOCFILES) $(DESTDIR)$(docdir)
45
+	$(INSTALL) -m 644 $(DOCFILES) $(DESTDIR)$(docdir)
46
 ifeq ($(HAVE_SYSTEMD),yes)
47
 	$(INSTALL) -d -m 0755 $(DESTDIR)$(systemduserunitdir) $(DESTDIR)$(systemdsystemunitdir)
48
 ifeq ($(RHEL),1)
49
@@ -125,8 +128,10 @@
50
 endif	
51
 endif
52
 ifeq ($(COMPLETIONS),yes)
53
-	$(INSTALL) -D -m 644 contrib/completions/complete.zsh $(DESTDIR)$(ZSH_COMPLETION_DIR)/_onedrive
54
-	$(INSTALL) -D -m 644 contrib/completions/complete.bash $(DESTDIR)$(BASH_COMPLETION_DIR)/onedrive
55
+	mkdir -p $(DESTDIR)$(ZSH_COMPLETION_DIR)
56
+	$(INSTALL) -m 644 contrib/completions/complete.zsh $(DESTDIR)$(ZSH_COMPLETION_DIR)/_onedrive
57
+	mkdir -p $(DESTDIR)$(BASH_COMPLETION_DIR)
58
+	$(INSTALL) -m 644 contrib/completions/complete.bash $(DESTDIR)$(BASH_COMPLETION_DIR)/onedrive
59
 endif
60
 
61
 
(-)b/net/onedrive/files/patch-configure.ac (+10 lines)
Added Link Here
1
--- configure.ac.orig	2020-04-21 17:07:18.318838000 +0900
2
+++ configure.ac	2020-04-21 17:09:11.896888000 +0900
3
@@ -144,6 +144,7 @@
4
 dnl Check for required modules: curl and sqlite at the moment
5
 PKG_CHECK_MODULES([curl],[libcurl])
6
 PKG_CHECK_MODULES([sqlite],[sqlite3])
7
+PKG_CHECK_MODULES([inotify],[libinotify])
8
 
9
 dnl
10
 dnl systemd and unit file directories
(-)b/net/onedrive/pkg-descr (-10 / +16 lines)
Lines 1-15 Link Here
1
A complete tool to interact with OneDrive on Linux.
1
A free Microsoft OneDrive Client which supports OneDrive Personal, OneDrive
2
Built following the UNIX philosophy.
2
for Business, OneDrive for Office365 and Sharepoint.
3
This Powerful and highly configurable client can run on all major Linux
4
distributions, as a Docker container and on FreeBSD.
5
This client is a 'fork' of skilion client which was abandoned in 2018.
3
6
4
Features:
7
Features:
5
    State caching
8
    * State caching
6
    Real-Time file monitoring with Inotify
9
    * Real-Time file monitoring with Inotify
7
    Resumable uploads
10
    * File uploat / download validation to ensure data integrity
8
    Support OneDrive for Business (part of Office 365)
11
    * Resumable uploads
9
    Shared folders (not Business)
12
    * Support OneDrive for Business (part of Office 365)
13
    * Sharepoint / Office365 Shared libraries (refer to docs/Office365.md
14
      to configure)
10
15
11
What's missing:
16
What's missing:
12
    While local changes are uploaded right away, remote changes are delayed
17
    * While local changes are uploaded right away, remote changes are delayed
13
    No GUI
18
      until next sync when using --monitor
19
    * No GUI
14
20
15
WWW: https://github.com/skilion/onedrive
21
WWW: https://github.com/abraunegg/onedrive
(-)b/net/onedrive/pkg-message (+9 lines)
Added Link Here
1
[
2
{ type: install
3
  message: <<EOM
4
When upgraded from older version, the onedrive client should fail to
5
synchronize. In this case, execute onedrive --logout to logout and
6
re-authenticate. For more detail, see USAGE.md.
7
EOM
8
}
9
]
(-)b/net/onedrive/pkg-plist (-7 / +8 lines)
Lines 1-10 Link Here
1
bin/onedrive
1
bin/onedrive
2
etc/logrotate.d/onedrive
2
etc/logrotate.d/onedrive
3
%%DOCS%%man/man1/onedrive.1.gz
3
man/man1/onedrive.1.gz
4
%%BASH%%share/bash-completion/completions/onedrive
4
%%COMPLETION%%etc/bash_completion.d/onedrive
5
%%ZSH%%share/zsh/site-functions/_onedrive
5
%%COMPLETION%%share/zsh/site-functions/_onedrive
6
%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md
6
%%DOCSDIR%%/CHANGELOG.md
7
%%PORTDOCS%%%%DOCSDIR%%/README.Office365.md
7
%%DOCSDIR%%/Office365.md
8
%%PORTDOCS%%%%DOCSDIR%%/README.md
8
%%DOCSDIR%%/README.md
9
%%PORTDOCS%%%%DOCSDIR%%/config
9
%%DOCSDIR%%/USAGE.md
10
%%DOCSDIR%%/config
10
@dir /var/log/onedrive
11
@dir /var/log/onedrive

Return to bug 245805