3 files changed, 46 insertions, 35 deletions

diff --git a/mail/gnarwl/files/patch-data-Makefile b/mail/gnarwl/files/patch-data-Makefile
index 000c3b1c4044..f6fa5497cadb 100644
--- a/mail/gnarwl/files/patch-data-Makefile
+++ b/mail/gnarwl/files/patch-data-Makefile
@@ -1,7 +1,11 @@
---- data/Makefile.orig	2005-03-13 22:30:54.000000000 +0800
-+++ data/Makefile	2014-06-08 20:56:18.860668685 +0800
-@@ -4,20 +4,22 @@ catch:
- all: clean spec config
+--- data/Makefile.orig	2005-03-13 14:30:54 UTC
++++ data/Makefile
+@@ -1,23 +1,25 @@
+ catch:
+ 	$(MAKE) -C .. all
+ 
+-all: clean spec config
++all: spec config
  
  clean: 
 -	rm -f $(BIN)-$(VER).spec gnarwl.cfg
@@ -23,13 +27,13 @@
 -	install -m 600 gnarwl.cfg $(CONFDIR)
 -	cat badheaders.txt | $(SBINDIR)/$(SBIN) -a $(HOMEDIR)/badheaders.db
 -	cat blacklist.txt | $(SBINDIR)/$(SBIN) -a $(HOMEDIR)/blacklist.db
-+	mkdir -m 755 -p  $(DESTDIR)$(HOMEDIR)/block $(DESTDIR)$(HOMEDIR)/bin $(DESTDIR)$(CONFDIR)
++	mkdir -p  $(DESTDIR)$(HOMEDIR)/block $(DESTDIR)$(HOMEDIR)/bin $(DESTDIR)$(CONFDIR)
 +	echo \|$(BINDIR)/$(BIN) > $(DESTDIR)$(HOMEDIR)/.forward
-+	install -m 644 header.txt $(DESTDIR)$(HOMEDIR)/header.txt.sample
-+	install -m 644 footer.txt $(DESTDIR)$(HOMEDIR)/footer.txt.sample
-+	install -m 644 badheaders.txt $(DESTDIR)$(HOMEDIR)/badheaders.txt.sample
-+	install -m 644 blacklist.txt $(DESTDIR)$(HOMEDIR)/blacklist.txt.sample
-+	install -m 600 gnarwl.cfg.sample $(DESTDIR)$(CONFDIR)
++	$(BSD_INSTALL_DATA) header.txt $(DESTDIR)$(HOMEDIR)/header.txt.sample
++	$(BSD_INSTALL_DATA) footer.txt $(DESTDIR)$(HOMEDIR)/footer.txt.sample
++	$(BSD_INSTALL_DATA) badheaders.txt $(DESTDIR)$(HOMEDIR)/badheaders.txt.sample
++	$(BSD_INSTALL_DATA) blacklist.txt $(DESTDIR)$(HOMEDIR)/blacklist.txt.sample
++	$(BSD_INSTALL_DATA) gnarwl.cfg.sample $(DESTDIR)$(CONFDIR)
 +	cat badheaders.txt | $(DESTDIR)$(SBINDIR)/$(SBIN) -a $(DESTDIR)$(HOMEDIR)/badheaders.db.sample
 +	cat blacklist.txt | $(DESTDIR)$(SBINDIR)/$(SBIN) -a $(DESTDIR)$(HOMEDIR)/blacklist.db.sample
  
diff --git a/mail/gnarwl/files/patch-doc-Makefile b/mail/gnarwl/files/patch-doc-Makefile
index 371eb6b18028..bb95fab7d232 100644
--- a/mail/gnarwl/files/patch-doc-Makefile
+++ b/mail/gnarwl/files/patch-doc-Makefile
@@ -1,6 +1,6 @@
---- doc/Makefile.orig	2005-03-13 22:30:53.000000000 +0800
-+++ doc/Makefile	2014-06-08 20:53:49.623678413 +0800
-@@ -8,24 +8,24 @@ clean: 
+--- doc/Makefile.orig	2005-03-13 14:30:53 UTC
++++ doc/Makefile
+@@ -8,24 +8,22 @@ clean: 
  
  manpage:
  	@echo Generating manpage...
@@ -27,19 +27,17 @@
 -	gzip -f -9 $(DOCDIR)/HISTORY
 -	gzip -f -9 $(MANDIR)/man$(MAN_SEC)/$(BIN).$(MAN_SEC)
 -	gzip -f -9 $(MANDIR)/man$(MAN_SEC)/$(SBIN).$(MAN_SEC)
-+	mkdir -m 755 -p $(DESTDIR)$(DOCDIR) $(DESTDIR)$(MANDIR)/man$(MAN_SEC)
-+	install -m 644 $(BIN).$(MAN_SEC) $(DESTDIR)$(MANDIR)/man$(MAN_SEC)
-+	install -m 644 $(SBIN).$(MAN_SEC) $(DESTDIR)$(MANDIR)/man$(MAN_SEC)
-+	install -m 644 FAQ $(DESTDIR)$(DOCDIR)
-+	install -m 644 LICENSE $(DESTDIR)$(DOCDIR)
-+	install -m 644 AUTHORS $(DESTDIR)$(DOCDIR)
-+	install -m 644 INSTALL $(DESTDIR)$(DOCDIR)
-+	install -m 644 ISPEnv.schema $(DESTDIR)$(DOCDIR)
-+	install -m 644 ISPEnv2.schema $(DESTDIR)$(DOCDIR)
-+	install -m 644 example.ldif $(DESTDIR)$(DOCDIR)
-+	install -m 644 HISTORY $(DESTDIR)$(DOCDIR)
-+	install -m 644 README $(DESTDIR)$(DOCDIR)
-+	gzip -f -9 $(DESTDIR)$(DOCDIR)/FAQ
-+	gzip -f -9 $(DESTDIR)$(DOCDIR)/HISTORY
-+	gzip -f -9 $(DESTDIR)$(MANDIR)/man$(MAN_SEC)/$(BIN).$(MAN_SEC)
-+	gzip -f -9 $(DESTDIR)$(MANDIR)/man$(MAN_SEC)/$(SBIN).$(MAN_SEC)
++	mkdir -p $(DESTDIR)$(DOCDIR) $(DESTDIR)$(MANDIR)/man$(MAN_SEC)
++	$(BSD_INSTALL_MAN) $(BIN).$(MAN_SEC) $(DESTDIR)$(MANDIR)/man$(MAN_SEC)
++	$(BSD_INSTALL_MAN) $(SBIN).$(MAN_SEC) $(DESTDIR)$(MANDIR)/man$(MAN_SEC)
++	gzip -f -9 FAQ
++	gzip -f -9 HISTORY
++	$(BSD_INSTALL_DATA) FAQ.gz $(DESTDIR)$(DOCDIR)
++	$(BSD_INSTALL_DATA) HISTORY.gz $(DESTDIR)$(DOCDIR)
++	$(BSD_INSTALL_DATA) LICENSE $(DESTDIR)$(DOCDIR)
++	$(BSD_INSTALL_DATA) AUTHORS $(DESTDIR)$(DOCDIR)
++	$(BSD_INSTALL_DATA) INSTALL $(DESTDIR)$(DOCDIR)
++	$(BSD_INSTALL_DATA) ISPEnv.schema $(DESTDIR)$(DOCDIR)
++	$(BSD_INSTALL_DATA) ISPEnv2.schema $(DESTDIR)$(DOCDIR)
++	$(BSD_INSTALL_DATA) example.ldif $(DESTDIR)$(DOCDIR)
++	$(BSD_INSTALL_DATA) README $(DESTDIR)$(DOCDIR)
diff --git a/mail/gnarwl/files/patch-src__Makefile b/mail/gnarwl/files/patch-src__Makefile
index 50ea4fb4e94e..b29833e7f153 100644
--- a/mail/gnarwl/files/patch-src__Makefile
+++ b/mail/gnarwl/files/patch-src__Makefile
@@ -1,13 +1,22 @@
---- ./src/Makefile.orig	2005-03-13 14:30:54.000000000 +0000
-+++ ./src/Makefile	2014-06-09 20:56:55.000000000 +0000
-@@ -14,7 +14,7 @@
+--- src/Makefile.orig	2005-03-13 14:30:54 UTC
++++ src/Makefile
+@@ -4,7 +4,7 @@ SOBJ=config.o dbaccess.o util.o
+ catch:
+ 	$(MAKE) -C ..
+ 
+-all: clean compile
++all: compile
+ 
+ compile: $(OBJ) $(SOBJ)
+ 	$(CC) $(CFLAGS) $(LFLAGS) -o $(BIN) gnarwl.c $(OBJ)
+@@ -14,7 +14,7 @@ clean:
  	rm -f DEADJOE *.o *~ $(BIN) $(SBIN)
  
  install:
 -	mkdir -m 755 -p $(BINDIR) $(SBINDIR)
 -	install -m 755 -s $(BIN) $(BINDIR)
 -	install -m 755 -s $(SBIN) $(SBINDIR)
-+	mkdir -m 755 -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR)
-+	install -m 755 -s $(BIN) $(DESTDIR)$(BINDIR)
-+	install -m 755 -s $(SBIN) $(DESTDIR)$(SBINDIR)
++	mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR)
++	$(BSD_INSTALL_PROGRAM) $(BIN) $(DESTDIR)$(BINDIR)
++	$(BSD_INSTALL_PROGRAM) $(SBIN) $(DESTDIR)$(SBINDIR)