Attachment #217217 for bug #248661

Lines 2-8 Link Here

(-)b/net/onedrive/Makefile (-2 / +2 lines)
2		2
3	PORTNAME= onedrive	3	PORTNAME= onedrive
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 2.4.3	5	DISTVERSION= 2.4.5
6	CATEGORIES= net	6	CATEGORIES= net
7		7
8	MAINTAINER= hiroo.ono+freebsd@gmail.com	8	MAINTAINER= hiroo.ono+freebsd@gmail.com
Lines 32-38 NOTIFY_USES= gnome Link Here
32	NOTIFY_USE= GNOME=glib20,gdkpixbuf2	32	NOTIFY_USE= GNOME=glib20,gdkpixbuf2
33	NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify	33	NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify
34		34
35	COMPLETION_DESC= Install completion for BASH and ZSH	35	COMPLETION_DESC= Install completion for BASH, FISH and ZSH
36	COMPLETION_CONFIGURE_ENABLE= completions	36	COMPLETION_CONFIGURE_ENABLE= completions
37		37
38	ONEDRIVE_LOGDIR= /var/log/${PORTNAME}	38	ONEDRIVE_LOGDIR= /var/log/${PORTNAME}

Lines 1-3 Link Here

(-)b/net/onedrive/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1594652822	1	TIMESTAMP = 1597439319
2	SHA256 (abraunegg-onedrive-v2.4.3_GH0.tar.gz) = 4236f436b3658e360164d945a8bc5c9620539c1339ef9182e3d060d2e3b90b9b	2	SHA256 (abraunegg-onedrive-v2.4.5_GH0.tar.gz) = 1f1f5e1f2f37376b6d96bda2426552a94a8b195f545b4fb7f3668c4fe2e8f6a0
3	SIZE (abraunegg-onedrive-v2.4.3_GH0.tar.gz) = 959963	3	SIZE (abraunegg-onedrive-v2.4.5_GH0.tar.gz) = 965217




--- Makefile.in.orig	2020-08-10 21:41:08 UTC
+++ Makefile.in
@@ -25,6 +25,7 @@ systemdsystemunitdir = @systemdsystemunitdir@
 curl_LIBS = @curl_LIBS@

 COMPLETIONS = @COMPLETIONS@
 BASH_COMPLETION_DIR = @BASH_COMPLETION_DIR@
 ZSH_COMPLETION_DIR = @ZSH_COMPLETION_DIR@
@@ -55,7 +56,7 @@ endif
 system_unit_files = contrib/systemd/onedrive@.service
 user_unit_files = contrib/systemd/onedrive.service
 

 
 ifneq ("$(wildcard /etc/redhat-release)","")
 RHEL = $(shell cat /etc/redhat-release | grep -E "(Red Hat Enterprise Linux Server|CentOS)" | wc -l)
@@ -67,6 +68,7 @@ endif
 
 SOURCES = \
 	src/config.d \

 	src/itemdb.d \
 	src/log.d \
 	src/main.d \
@@ -102,14 +104,15 @@ onedrive: $(SOURCES)
 	else \
 		echo $(version) > version ; \
 	fi

 ifeq ($(HAVE_SYSTEMD),yes)
 	$(INSTALL) -d -m 0755 $(DESTDIR)$(systemduserunitdir) $(DESTDIR)$(systemdsystemunitdir)
 ifeq ($(RHEL),1)
@@ -126,9 +129,12 @@ ifeq ($(RHEL_VERSION),6)
 endif	
 endif
 ifeq ($(COMPLETIONS),yes)
-	$(INSTALL) -D -m 644 contrib/completions/complete.zsh $(DESTDIR)$(ZSH_COMPLETION_DIR)/_onedrive
-	$(INSTALL) -D -m 644 contrib/completions/complete.bash $(DESTDIR)$(BASH_COMPLETION_DIR)/onedrive
-	$(INSTALL) -D -m 644 contrib/completions/complete.fish $(DESTDIR)$(FISH_COMPLETION_DIR)/onedrive.fish
+	mkdir -p $(DESTDIR)$(ZSH_COMPLETION_DIR)
+	$(INSTALL) -m 644 contrib/completions/complete.zsh $(DESTDIR)$(ZSH_COMPLETION_DIR)/_onedrive
+	mkdir -p $(DESTDIR)$(BASH_COMPLETION_DIR)
+	$(INSTALL) -m 644 contrib/completions/complete.bash $(DESTDIR)$(BASH_COMPLETION_DIR)/onedrive
+	mkdir -p $(DESTDIR)$(FISH_COMPLETION_DIR)
+	$(INSTALL) -m 644 contrib/completions/complete.fish $(DESTDIR)$(FISH_COMPLETION_DIR)/onedrive.fish
 endif
 
 

Lines 3-8 etc/logrotate.d/onedrive Link Here

(-)b/net/onedrive/pkg-plist (+1 lines)
3	man/man1/onedrive.1.gz	3	man/man1/onedrive.1.gz
4	%%COMPLETION%%etc/bash_completion.d/onedrive	4	%%COMPLETION%%etc/bash_completion.d/onedrive
5	%%COMPLETION%%share/zsh/site-functions/_onedrive	5	%%COMPLETION%%share/zsh/site-functions/_onedrive
		6	%%COMPLETION%%share/fish/completions/onedrive.fish
6	%%DOCSDIR%%/CHANGELOG.md	7	%%DOCSDIR%%/CHANGELOG.md
7	%%DOCSDIR%%/Office365.md	8	%%DOCSDIR%%/Office365.md
8	%%DOCSDIR%%/README.md	9	%%DOCSDIR%%/README.md

Return to bug 248661

Lines 1-4 Link Here

(-)b/net/onedrive/files/patch-Makefile.in (-5 / +8 lines)
1	--- Makefile.in.orig 2020-07-13 17:07:56 UTC	1	--- Makefile.in.orig 2020-08-10 21:41:08 UTC
2	+++ Makefile.in	2	+++ Makefile.in
3	@@ -25,6 +25,7 @@ systemdsystemunitdir = @systemdsystemunitdir@	3	@@ -25,6 +25,7 @@ systemdsystemunitdir = @systemdsystemunitdir@
4	curl_LIBS = @curl_LIBS@	4	curl_LIBS = @curl_LIBS@
Lines 8-14 Link Here
8	COMPLETIONS = @COMPLETIONS@	8	COMPLETIONS = @COMPLETIONS@
9	BASH_COMPLETION_DIR = @BASH_COMPLETION_DIR@	9	BASH_COMPLETION_DIR = @BASH_COMPLETION_DIR@
10	ZSH_COMPLETION_DIR = @ZSH_COMPLETION_DIR@	10	ZSH_COMPLETION_DIR = @ZSH_COMPLETION_DIR@
11	@@ -54,7 +55,7 @@ endif	11	@@ -55,7 +56,7 @@ endif
12	system_unit_files = contrib/systemd/onedrive@.service	12	system_unit_files = contrib/systemd/onedrive@.service
13	user_unit_files = contrib/systemd/onedrive.service	13	user_unit_files = contrib/systemd/onedrive.service
14		14
Lines 17-23 Link Here
17		17
18	ifneq ("$(wildcard /etc/redhat-release)","")	18	ifneq ("$(wildcard /etc/redhat-release)","")
19	RHEL = $(shell cat /etc/redhat-release \| grep -E "(Red Hat Enterprise Linux Server\|CentOS)" \| wc -l)	19	RHEL = $(shell cat /etc/redhat-release \| grep -E "(Red Hat Enterprise Linux Server\|CentOS)" \| wc -l)
20	@@ -66,6 +67,7 @@ endif	20	@@ -67,6 +68,7 @@ endif
21		21
22	SOURCES = \	22	SOURCES = \
23	src/config.d \	23	src/config.d \
Lines 25-31 Link Here
25	src/itemdb.d \	25	src/itemdb.d \
26	src/log.d \	26	src/log.d \
27	src/main.d \	27	src/main.d \
28	@@ -101,14 +103,15 @@ onedrive: $(SOURCES)	28	@@ -102,14 +104,15 @@ onedrive: $(SOURCES)
29	else \	29	else \
30	echo $(version) > version ; \	30	echo $(version) > version ; \
31	fi	31	fi
Lines 46-61 Link Here
46	ifeq ($(HAVE_SYSTEMD),yes)	46	ifeq ($(HAVE_SYSTEMD),yes)
47	$(INSTALL) -d -m 0755 $(DESTDIR)$(systemduserunitdir) $(DESTDIR)$(systemdsystemunitdir)	47	$(INSTALL) -d -m 0755 $(DESTDIR)$(systemduserunitdir) $(DESTDIR)$(systemdsystemunitdir)
48	ifeq ($(RHEL),1)	48	ifeq ($(RHEL),1)
49	@@ -125,8 +128,10 @@ ifeq ($(RHEL_VERSION),6)	49	@@ -126,9 +129,12 @@ ifeq ($(RHEL_VERSION),6)
50	endif	50	endif
51	endif	51	endif
52	ifeq ($(COMPLETIONS),yes)	52	ifeq ($(COMPLETIONS),yes)
53	- $(INSTALL) -D -m 644 contrib/completions/complete.zsh $(DESTDIR)$(ZSH_COMPLETION_DIR)/_onedrive	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	54	- $(INSTALL) -D -m 644 contrib/completions/complete.bash $(DESTDIR)$(BASH_COMPLETION_DIR)/onedrive
		55	- $(INSTALL) -D -m 644 contrib/completions/complete.fish $(DESTDIR)$(FISH_COMPLETION_DIR)/onedrive.fish
55	+ mkdir -p $(DESTDIR)$(ZSH_COMPLETION_DIR)	56	+ mkdir -p $(DESTDIR)$(ZSH_COMPLETION_DIR)
56	+ $(INSTALL) -m 644 contrib/completions/complete.zsh $(DESTDIR)$(ZSH_COMPLETION_DIR)/_onedrive	57	+ $(INSTALL) -m 644 contrib/completions/complete.zsh $(DESTDIR)$(ZSH_COMPLETION_DIR)/_onedrive
57	+ mkdir -p $(DESTDIR)$(BASH_COMPLETION_DIR)	58	+ mkdir -p $(DESTDIR)$(BASH_COMPLETION_DIR)
58	+ $(INSTALL) -m 644 contrib/completions/complete.bash $(DESTDIR)$(BASH_COMPLETION_DIR)/onedrive	59	+ $(INSTALL) -m 644 contrib/completions/complete.bash $(DESTDIR)$(BASH_COMPLETION_DIR)/onedrive
		60	+ mkdir -p $(DESTDIR)$(FISH_COMPLETION_DIR)
		61	+ $(INSTALL) -m 644 contrib/completions/complete.fish $(DESTDIR)$(FISH_COMPLETION_DIR)/onedrive.fish
59	endif	62	endif
60		63
61		64