Mode for non-executables is 644, not 755.

Compression of manpages should be dealt with in the FreeBSD port Makefile,
   not by patching the dist Makefile.  (more obvious to those looking at the
   port).

1 files changed, 51 insertions, 71 deletions

diff --git a/ftp/wu-ftpd+ipv6/files/patch-ab b/ftp/wu-ftpd+ipv6/files/patch-ab
index ead2ac8ae752..e8ea68abc559 100644
--- a/ftp/wu-ftpd+ipv6/files/patch-ab
+++ b/ftp/wu-ftpd+ipv6/files/patch-ab
@@ -1,71 +1,51 @@
-*** Makefile.orig	Fri Apr  1 23:03:58 1994
---- Makefile	Fri Dec 29 23:51:30 1995
-***************
-*** 1,25 ****
-! BINDIR=		/usr/local/bin
-! ETCDIR=		/usr/local/etc
-! MANDIR=		/usr/local/man
-  MANEXT=		8
-  
-  all:
-  	@ echo 'Use the "build" command (shell script) to make ftpd.'
-  	@ echo 'You can say "build help" for details on how it works.'
-  
-  install: bin/ftpd bin/ftpcount bin/ftpshut
-! 	-mv -f ${ETCDIR}/ftpd ${ETCDIR}/ftpd-old
-  	@echo Installing binaries.
-! 	install -o bin -g bin -m 755 bin/ftpd ${ETCDIR}/ftpd
-! 	install -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut
-! 	install -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount
-! 	install -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho
-  	@echo Installing manpages.
-! 	install -o bin -g bin -m 755 doc/ftpd.8 ${MANDIR}/man8/ftpd.8
-! 	install -o bin -g bin -m 755 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1
-! 	install -o bin -g bin -m 755 doc/ftpwho.1 ${MANDIR}/man1/ftpwho.1
-! 	install -o bin -g bin -m 755 doc/ftpshut.8 ${MANDIR}/man8/ftpshut.8
-! 	install -o bin -g bin -m 755 doc/ftpaccess.5 ${MANDIR}/man5/ftpaccess.5
-! 	install -o bin -g bin -m 755 doc/ftphosts.5 ${MANDIR}/man5/ftphosts.5
-! 	install -o bin -g bin -m 755 doc/ftpconversions.5 ${MANDIR}/man5/ftpconversions.5
-! 	install -o bin -g bin -m 755 doc/xferlog.5 ${MANDIR}/man5/xferlog.5
---- 1,41 ----
-! BINDIR=		${PREFIX}/bin
-! LIBEXECDIR=	${PREFIX}/libexec
-! ETCDIR=		${PREFIX}/etc
-! MANDIR=		${PREFIX}/man
-  MANEXT=		8
-  
-  all:
-+ 	/bin/sh build fb2
-  	@ echo 'Use the "build" command (shell script) to make ftpd.'
-  	@ echo 'You can say "build help" for details on how it works.'
-  
-  install: bin/ftpd bin/ftpcount bin/ftpshut
-! 	-mv -f ${LIBEXECDIR}/ftpd ${LIBEXECDIR}/ftpd-old
-  	@echo Installing binaries.
-! 	install -c -o bin -g bin -m 755 bin/ftpd ${LIBEXECDIR}/ftpd
-! 	install -c -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut
-! 	install -c -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount
-! 	install -c -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho
-! 	install -c -o bin -g bin -m 755 bin/ckconfig ${BINDIR}/ftpckconfig
-! 	@echo Installing basic configuration
-! 	install -c -o root -g bin -m 755 doc/examples/ftpaccess ${ETCDIR}/ftpaccess.example
-! 	install -c -o root -g bin -m 755 doc/examples/ftpusers ${ETCDIR}/ftpusers.example
-! 	install -c -o root -g bin -m 755 doc/examples/ftpconversions ${ETCDIR}/ftpconversions.example
-  	@echo Installing manpages.
-! 	install -c -o bin -g bin -m 755 doc/ftpd.8 ${MANDIR}/man8/ftpd.8
-! 	install -c -o bin -g bin -m 755 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1
-! 	install -c -o bin -g bin -m 755 doc/ftpwho.1 ${MANDIR}/man1/ftpwho.1
-! 	install -c -o bin -g bin -m 755 doc/ftpshut.8 ${MANDIR}/man8/ftpshut.8
-! 	install -c -o bin -g bin -m 755 doc/ftpaccess.5 ${MANDIR}/man5/ftpaccess.5
-! 	install -c -o bin -g bin -m 755 doc/ftphosts.5 ${MANDIR}/man5/ftphosts.5
-! 	install -c -o bin -g bin -m 755 doc/ftpconversions.5 ${MANDIR}/man5/ftpconversions.5
-! 	install -c -o bin -g bin -m 755 doc/xferlog.5 ${MANDIR}/man5/xferlog.5
-! 	@echo Compressing manpages
-! 	gzip -f -9 ${MANDIR}/man8/ftpd.8
-! 	gzip -f -9 ${MANDIR}/man1/ftpcount.1
-! 	gzip -f -9 ${MANDIR}/man1/ftpwho.1
-! 	gzip -f -9 ${MANDIR}/man8/ftpshut.8
-! 	gzip -f -9 ${MANDIR}/man5/ftpaccess.5
-! 	gzip -f -9 ${MANDIR}/man5/ftphosts.5
-! 	gzip -f -9 ${MANDIR}/man5/ftpconversions.5
-! 	gzip -f -9 ${MANDIR}/man5/xferlog.5
+--- Makefile.orig	Fri Apr  1 11:03:58 1994
++++ Makefile	Sat Nov 30 17:31:22 1996
+@@ -1,25 +1,32 @@
+-BINDIR=		/usr/local/bin
+-ETCDIR=		/usr/local/etc
+-MANDIR=		/usr/local/man
++BINDIR=		${PREFIX}/bin
++LIBEXECDIR=	${PREFIX}/libexec
++ETCDIR=		${PREFIX}/etc
++MANDIR=		${PREFIX}/man
+ MANEXT=		8
+ 
+ all:
++	/bin/sh build fb2
+ 	@ echo 'Use the "build" command (shell script) to make ftpd.'
+ 	@ echo 'You can say "build help" for details on how it works.'
+ 
+ install: bin/ftpd bin/ftpcount bin/ftpshut
+-	-mv -f ${ETCDIR}/ftpd ${ETCDIR}/ftpd-old
++	-mv -f ${LIBEXECDIR}/ftpd ${LIBEXECDIR}/ftpd-old
+ 	@echo Installing binaries.
+-	install -o bin -g bin -m 755 bin/ftpd ${ETCDIR}/ftpd
+-	install -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut
+-	install -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount
+-	install -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho
++	install -c -o bin -g bin -m 755 bin/ftpd ${LIBEXECDIR}/ftpd
++	install -c -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut
++	install -c -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount
++	install -c -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho
++	install -c -o bin -g bin -m 755 bin/ckconfig ${BINDIR}/ftpckconfig
++	@echo Installing basic configuration
++	install -c -o root -g bin -m 644 doc/examples/ftpaccess ${ETCDIR}/ftpaccess.example
++	install -c -o root -g bin -m 644 doc/examples/ftpusers ${ETCDIR}/ftpusers.example
++	install -c -o root -g bin -m 644 doc/examples/ftpconversions ${ETCDIR}/ftpconversions.example
+ 	@echo Installing manpages.
+-	install -o bin -g bin -m 755 doc/ftpd.8 ${MANDIR}/man8/ftpd.8
+-	install -o bin -g bin -m 755 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1
+-	install -o bin -g bin -m 755 doc/ftpwho.1 ${MANDIR}/man1/ftpwho.1
+-	install -o bin -g bin -m 755 doc/ftpshut.8 ${MANDIR}/man8/ftpshut.8
+-	install -o bin -g bin -m 755 doc/ftpaccess.5 ${MANDIR}/man5/ftpaccess.5
+-	install -o bin -g bin -m 755 doc/ftphosts.5 ${MANDIR}/man5/ftphosts.5
+-	install -o bin -g bin -m 755 doc/ftpconversions.5 ${MANDIR}/man5/ftpconversions.5
+-	install -o bin -g bin -m 755 doc/xferlog.5 ${MANDIR}/man5/xferlog.5
++	install -c -o bin -g bin -m 644 doc/ftpd.8 ${MANDIR}/man8/ftpd.8
++	install -c -o bin -g bin -m 644 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1
++	install -c -o bin -g bin -m 644 doc/ftpwho.1 ${MANDIR}/man1/ftpwho.1
++	install -c -o bin -g bin -m 644 doc/ftpshut.8 ${MANDIR}/man8/ftpshut.8
++	install -c -o bin -g bin -m 644 doc/ftpaccess.5 ${MANDIR}/man5/ftpaccess.5
++	install -c -o bin -g bin -m 644 doc/ftphosts.5 ${MANDIR}/man5/ftphosts.5
++	install -c -o bin -g bin -m 644 doc/ftpconversions.5 ${MANDIR}/man5/ftpconversions.5
++	install -c -o bin -g bin -m 644 doc/xferlog.5 ${MANDIR}/man5/xferlog.5