Attachment #203997 for bug #237545





PORTNAME=	onedrive
DISTVERSIONPREFIX=	v
DISTVERSION=	2.3.3
PORTREVISION=	1
CATEGORIES=	net

MAINTAINER=	hiroo.ono+freebsd@gmail.com
COMMENT=	OneDrive Free client

LICENSE=	GPLv3


LIB_DEPENDS=	libcurl.so:ftp/curl \
		libinotify.so:devel/libinotify
BUILD_DEPENDS=	ldc2:lang/ldc
RUN_DEPENDS=	${LOCALBASE}/sbin/logrotate:sysutils/logrotate

USES=		gmake pkgconfig sqlite
USE_GITHUB=	yes
GH_ACCOUNT=	abraunegg

PKGCONFIG=		pkgconf
MAKE_ARGS=		DC=ldc2
INSTALL_TARGET=		install.noservice

OPTIONS_DEFINE=		DOCS NOTIFY BASH ZSH
OPTIONS_DEFAULT=	DOCS NOTIFY BASH ZSH
OPTIONS_SUB=		yes

DOCFILES=		README.md README.Office365.md config CHANGELOG.md

NOTIFY_VARS=		NOTIFICATIONS=1
NOTIFY_USES=		gnome
NOTIFY_USE=		GNOME=glib20
NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify

BASH_COMPLETION_DIR=	${LOCALBASE}/share/bash-completion/completions
ZSH_COMPLETION_DIR=	${LOCALBASE}/share/zsh/site-functions

post-extract:
	${CP} ${FILESDIR}/freebsd_inotify.d ${WRKSRC}/src
	${CP} ${FILESDIR}/version ${WRKSRC}

do-install-DOCS-on:
.for f in ${DOCFILES}
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
.endfor

do-install-BASH-on:
	@${MKDIR} ${STAGEDIR}${BASH_COMPLETION_DIR}
	${INSTALL_DATA} ${WRKSRC}/completions/complete.bash \
		${STAGEDIR}${BASH_COMPLETION_DIR}/onedrive

do-install-ZSH-on:
	@${MKDIR} ${STAGEDIR}${ZSH_COMPLETION_DIR}
	${INSTALL_DATA} ${WRKSRC}/completions/complete.zsh \
		${STAGEDIR}${ZSH_COMPLETION_DIR}/_onedrive

post-install-DOCS-on:
	${INSTALL_MAN} ${WRKSRC}/onedrive.1 ${STAGEDIR}${MANPREFIX}/man/man1

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)net/onedrive/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1552643961	1	TIMESTAMP = 1556052070
2	SHA256 (skilion-onedrive-v1.1.3_GH0.tar.gz) = fb12235a73919b3374b8f27785b834a690fba1c6e70c6e6f1f5da3e51eb471a0	2	SHA256 (abraunegg-onedrive-v2.3.3_GH0.tar.gz) = 9ee4ea4b3ea880f7624761d053bbb09a2465706685e9ed258c50925ff5e32377
3	SIZE (skilion-onedrive-v1.1.3_GH0.tar.gz) = 35281	3	SIZE (abraunegg-onedrive-v2.3.3_GH0.tar.gz) = 599457




--- Makefile.orig	2019-04-16 02:18:26 UTC
+++ Makefile
@@ -7,8 +7,9 @@ gitversion := $(shell if [ -f .git/HEAD ] ; then echo 
 DC = dmd
-DFLAGS = -g -ofonedrive -O -L-lcurl -L-lsqlite3 -L-ldl -J.
+DFLAGS = -g -ofonedrive -O -L-lcurl -L-lsqlite3 -L-ldl -L-linotify -J.
 PREFIX = /usr/local
 
 ifeq ($(pkgconfig),1)
 LIBS = $(shell pkg-config --libs sqlite3 libcurl)
+LIBS += $(shell pkg-config --libs libinotify)
 else
-LIBS = -lcurl -lsqlite3
+LIBS = -lcurl -lsqlite3 -linotify
 endif
 ifeq ($(notifications),1)
 NOTIF_VERSIONS = -version=NoPragma -version=NoGdk -version=Notifications
@@ -74,7 +75,8 @@ SOURCES = \
 	src/sync.d \
 	src/upload.d \
 	src/util.d \
-	src/progress.d
+	src/progress.d \
+	src/freebsd_inotify.d
 
 ifeq ($(notifications),1)
 SOURCES += src/notifications/notify.d src/notifications/dnotify.d
@@ -90,11 +92,12 @@ onedrive: version $(SOURCES)
 
 install.noservice: onedrive onedrive.1
 	mkdir -p $(DESTDIR)/var/log/onedrive
-	chown root.users $(DESTDIR)/var/log/onedrive
+	# chown root.users $(DESTDIR)/var/log/onedrive
 	chmod 0775 $(DESTDIR)/var/log/onedrive
-	install -D onedrive $(DESTDIR)$(PREFIX)/bin/onedrive
-	install -D onedrive.1 $(DESTDIR)$(MANDIR)/onedrive.1
-	install -D -m 644 logrotate/onedrive.logrotate $(DESTDIR)/etc/logrotate.d/onedrive
+	install onedrive $(DESTDIR)$(PREFIX)/bin/onedrive
+	# install -D onedrive.1 $(DESTDIR)$(MANDIR)/onedrive.1
+	install -d $(DESTDIR)$(PREFIX)/etc/logrotate.d
+	install -m 644 logrotate/onedrive.logrotate $(DESTDIR)$(PREFIX)/etc/logrotate.d/onedrive
 
 install: all install.noservice
 	for i in $(DOCFILES) ; do install -D -m 644 $$i $(DESTDIR)$(DOCDIR)/$$i ; done
 
-onedrive.service:
-	sed "s|@PREFIX@|$(PREFIX)|g" onedrive.service.in > onedrive.service
-
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/onedrive
-	rm -f $(DESTDIR)/usr/lib/systemd/user/onedrive.service
-
-version: .git/HEAD .git/index
-	echo $(shell git describe --tags) >version
\ No newline at end of file




--- src/monitor.d.orig	2019-04-24 07:47:09 UTC
+++ src/monitor.d
@@ -1,4 +1,5 @@
-import core.sys.linux.sys.inotify;
+// import core.sys.linux.sys.inotify;
+import freebsd_inotify;
 import core.stdc.errno;
 import core.sys.posix.poll, core.sys.posix.unistd;
 import std.exception, std.file, std.path, std.regex, std.stdio, std.string;
 import config;
 import selective;
 import util;
+import freebsd_inotify;
 static import log;
 
 // relevant inotify events

Line 1 Link Here

(-)net/onedrive/files/version (-1 lines)
1	1.1.3

Lines 1-3 Link Here

(-)net/onedrive/pkg-plist (-2 / +9 lines)
1	bin/onedrive	1	bin/onedrive
2	%%DOCSDIR%%/README.md	2	etc/logrotate.d/onedrive
3	%%EXAMPLESDIR%%/config	3	%%DOCS%%man/man1/onedrive.1.gz
		4	%%BASH%%share/bash-completion/completions/onedrive
		5	%%ZSH%%share/zsh/site-functions/_onedrive
		6	%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md
		7	%%PORTDOCS%%%%DOCSDIR%%/README.Office365.md
		8	%%PORTDOCS%%%%DOCSDIR%%/README.md
		9	%%PORTDOCS%%%%DOCSDIR%%/config
		10	@dir /var/log/onedrive

Return to bug 237545

Lines 2-13 Link Here

(-)net/onedrive/Makefile (-14 / +40 lines)
2		2
3	PORTNAME= onedrive	3	PORTNAME= onedrive
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 1.1.3	5	DISTVERSION= 2.3.3
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= Microsoft OneDrive client	9	COMMENT= OneDrive Free client
11		10
12	LICENSE= GPLv3	11	LICENSE= GPLv3
13		12
Lines 14-36 Link Here
14	LIB_DEPENDS= libcurl.so:ftp/curl \	13	LIB_DEPENDS= libcurl.so:ftp/curl \
15	libinotify.so:devel/libinotify	14	libinotify.so:devel/libinotify
16	BUILD_DEPENDS= ldc2:lang/ldc	15	BUILD_DEPENDS= ldc2:lang/ldc
		16	RUN_DEPENDS= ${LOCALBASE}/sbin/logrotate:sysutils/logrotate
17		17
18	USES= sqlite	18	USES= gmake pkgconfig sqlite
19	USE_GITHUB= yes	19	USE_GITHUB= yes
20	GH_ACCOUNT= skilion	20	GH_ACCOUNT= abraunegg
21		21
22	MAKE_ARGS= DC=ldc2	22	PKGCONFIG= pkgconf
		23	MAKE_ARGS= DC=ldc2
		24	INSTALL_TARGET= install.noservice
23		25
24	.include <bsd.port.pre.mk>	26	OPTIONS_DEFINE= DOCS NOTIFY BASH ZSH
		27	OPTIONS_DEFAULT= DOCS NOTIFY BASH ZSH
		28	OPTIONS_SUB= yes
25		29
		30	DOCFILES= README.md README.Office365.md config CHANGELOG.md
		31
		32	NOTIFY_VARS= NOTIFICATIONS=1
		33	NOTIFY_USES= gnome
		34	NOTIFY_USE= GNOME=glib20
		35	NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify
		36
		37	BASH_COMPLETION_DIR= ${LOCALBASE}/share/bash-completion/completions
		38	ZSH_COMPLETION_DIR= ${LOCALBASE}/share/zsh/site-functions
		39
26	post-extract:	40	post-extract:
27	${CP} ${FILESDIR}/freebsd_inotify.d ${WRKSRC}/src	41	${CP} ${FILESDIR}/freebsd_inotify.d ${WRKSRC}/src
28	${CP} ${FILESDIR}/version ${WRKSRC}
29		42
30	do-install:	43	do-install-DOCS-on:
31	${INSTALL_PROGRAM} ${WRKSRC}/onedrive ${STAGEDIR}${PREFIX}/bin	44	.for f in ${DOCFILES}
32	${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${DOCSDIR}	45	@${MKDIR} ${STAGEDIR}${DOCSDIR}
33	${INSTALL_DATA} ${WRKSRC}/config ${STAGEDIR}${EXAMPLESDIR}	46	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
34	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}	47	.endfor
35		48
36	.include <bsd.port.post.mk>	49	do-install-BASH-on:
		50	@${MKDIR} ${STAGEDIR}${BASH_COMPLETION_DIR}
		51	${INSTALL_DATA} ${WRKSRC}/completions/complete.bash \
		52	${STAGEDIR}${BASH_COMPLETION_DIR}/onedrive
		53
		54	do-install-ZSH-on:
		55	@${MKDIR} ${STAGEDIR}${ZSH_COMPLETION_DIR}
		56	${INSTALL_DATA} ${WRKSRC}/completions/complete.zsh \
		57	${STAGEDIR}${ZSH_COMPLETION_DIR}/_onedrive
		58
		59	post-install-DOCS-on:
		60	${INSTALL_MAN} ${WRKSRC}/onedrive.1 ${STAGEDIR}${MANPREFIX}/man/man1
		61
		62	.include <bsd.port.mk>

Lines 1-43 Link Here

(-)net/onedrive/files/patch-Makefile (-34 / +31 lines)
1	--- Makefile.orig 2018-09-09 20:14:01 UTC	1	--- Makefile.orig 2019-04-16 02:18:26 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -1,5 +1,5 @@	3	@@ -7,8 +7,9 @@ gitversion := $(shell if [ -f .git/HEAD ] ; then echo
4	DC = dmd
5	-DFLAGS = -g -ofonedrive -O -L-lcurl -L-lsqlite3 -L-ldl -J.
6	+DFLAGS = -g -ofonedrive -O -L-lcurl -L-lsqlite3 -L-ldl -L-linotify -J.
7	PREFIX = /usr/local
8		4
9	SOURCES = \	5	ifeq ($(pkgconfig),1)
10	@@ -14,26 +14,19 @@ SOURCES = \	6	LIBS = $(shell pkg-config --libs sqlite3 libcurl)
11	src/sqlite.d \	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 = \
12	src/sync.d \	15	src/sync.d \
13	src/upload.d \	16	src/upload.d \
14	- src/util.d	17	src/util.d \
15	+ src/util.d \	18	- src/progress.d
		19	+ src/progress.d \
16	+ src/freebsd_inotify.d	20	+ src/freebsd_inotify.d
17		21
18	-all: onedrive onedrive.service	22	ifeq ($(notifications),1)
19	+all: onedrive	23	SOURCES += src/notifications/notify.d src/notifications/dnotify.d
		24	@@ -90,11 +92,12 @@ onedrive: version $(SOURCES)
20		25
21	clean:	26	install.noservice: onedrive onedrive.1
22	- rm -f onedrive onedrive.o onedrive.service	27	mkdir -p $(DESTDIR)/var/log/onedrive
23	+ rm -f onedrive onedrive.o	28	- chown root.users $(DESTDIR)/var/log/onedrive
24		29	+ # chown root.users $(DESTDIR)/var/log/onedrive
25	-install: all	30	chmod 0775 $(DESTDIR)/var/log/onedrive
26	- install -D onedrive $(DESTDIR)$(PREFIX)/bin/onedrive	31	- install -D onedrive $(DESTDIR)$(PREFIX)/bin/onedrive
27	- install -D -m 644 onedrive.service $(DESTDIR)/usr/lib/systemd/user/onedrive.service	32	- install -D onedrive.1 $(DESTDIR)$(MANDIR)/onedrive.1
28	+# install: all	33	- install -D -m 644 logrotate/onedrive.logrotate $(DESTDIR)/etc/logrotate.d/onedrive
29	+# install -D onedrive $(DESTDIR)$(PREFIX)/bin/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
30		38
31	onedrive: version $(SOURCES)	39	install: all install.noservice
32	$(DC) $(DFLAGS) $(SOURCES)	40	for i in $(DOCFILES) ; do install -D -m 644 $$i $(DESTDIR)$(DOCDIR)/$$i ; done
33
34	-onedrive.service:
35	- sed "s\|@PREFIX@\|$(PREFIX)\|g" onedrive.service.in > onedrive.service
36	-
37	uninstall:
38	rm -f $(DESTDIR)$(PREFIX)/bin/onedrive
39	- rm -f $(DESTDIR)/usr/lib/systemd/user/onedrive.service
40	-
41	-version: .git/HEAD .git/index
42	- echo $(shell git describe --tags) >version
43	\ No newline at end of file

Lines 1-15 Link Here

(-)net/onedrive/files/patch-src_monitor.d (-9 / +3 lines)
1	--- src/monitor.d.orig 2019-03-16 11:55:35 UTC	1	--- src/monitor.d.orig 2019-04-24 07:47:09 UTC
2	+++ src/monitor.d	2	+++ src/monitor.d
3	@@ -1,10 +1,11 @@	3	@@ -1,4 +1,5 @@
4	-import core.sys.linux.sys.inotify;	4	-import core.sys.linux.sys.inotify;
5	+// import core.sys.linux.sys.inotify;	5	+// import core.sys.linux.sys.inotify;
		6	+import freebsd_inotify;
6	import core.stdc.errno;	7	import core.stdc.errno;
7	import core.sys.posix.poll, core.sys.posix.unistd;	8	import core.sys.posix.poll, core.sys.posix.unistd;
8	import std.exception, std.file, std.path, std.regex, std.stdio, std.string;	9	import std.exception, std.file, std.path, std.regex, std.stdio, std.string;
9	import config;
10	import selective;
11	import util;
12	+import freebsd_inotify;
13	static import log;
14
15	// relevant inotify events