Don't overwrite our permissions to make DESTDIR work.

2 files changed, 45 insertions, 21 deletions

diff --git a/net/wu-ftpd/distinfo b/net/wu-ftpd/distinfo
index 592747e1978..eea969c7db9 100644
--- a/net/wu-ftpd/distinfo
+++ b/net/wu-ftpd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2006/09/22 19:44:01 joerg Exp $
+$NetBSD: distinfo,v 1.16 2010/02/14 21:36:20 joerg Exp $
 
 SHA1 (wu-ftpd/wu-ftpd-2.6.2.tar.gz) = e39112bd8a67f189b6a8da8dd81ceb00a910e271
 RMD160 (wu-ftpd/wu-ftpd-2.6.2.tar.gz) = 0b7451c185f80cf9a345f97b9642853e0323e3bd
@@ -10,7 +10,7 @@ SHA1 (wu-ftpd/connect-dos.patch) = 8d1131ee3d1bdcb780552ea2d32816989793ae0b
 RMD160 (wu-ftpd/connect-dos.patch) = 197994b4af91fd1a6c951b245313598eaa99e398
 Size (wu-ftpd/connect-dos.patch) = 2307 bytes
 SHA1 (patch-aa) = 0e11b95eb9ce697d48d3665d3bb5dc903b67d89b
-SHA1 (patch-ab) = c3c91639939142ac5c49aa6897d4c0df211b74c6
+SHA1 (patch-ab) = cd2f3f74508c2bd379a64b7ddebbd73015be7662
 SHA1 (patch-ac) = b5f6142045bb092e7dc6b1420d17c15d594d9350
 SHA1 (patch-ad) = 3aafdad6da3ae50272d78c605f3bc2285b0ea085
 SHA1 (patch-ae) = 9abb285c65bb3a764a838f22ee9bdc34371265e4
diff --git a/net/wu-ftpd/patches/patch-ab b/net/wu-ftpd/patches/patch-ab
index 12112c8e042..19d916754b3 100644
--- a/net/wu-ftpd/patches/patch-ab
+++ b/net/wu-ftpd/patches/patch-ab
@@ -1,29 +1,53 @@
-$NetBSD: patch-ab,v 1.8 2000/07/08 16:52:05 rh Exp $
+$NetBSD: patch-ab,v 1.9 2010/02/14 21:36:20 joerg Exp $
 
---- Makefile.in.orig	Sat Jul  1 19:42:15 2000
-+++ Makefile.in	Sat Jul  8 18:41:53 2000
-@@ -67,11 +67,13 @@
+--- Makefile.in.orig	2000-07-01 17:42:15.000000000 +0000
++++ Makefile.in
+@@ -67,25 +67,28 @@ install: all
  	-@mkdir -p $(DESTDIR)/$(mandir)/man1
  	-@mkdir -p $(DESTDIR)/$(mandir)/man5
  	-@mkdir -p $(DESTDIR)/@ETCDIR@
 -	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpd $(DESTDIR)/@sbindir@/in.ftpd
+-	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpshut $(DESTDIR)/@sbindir@/ftpshut
+-	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpcount $(DESTDIR)/@bindir@/ftpcount
+-	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpwho $(DESTDIR)/@bindir@/ftpwho
+-	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ckconfig $(DESTDIR)/@sbindir@/ckconfig
+-	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftprestart $(DESTDIR)/@sbindir@/ftprestart
+-	@INSTALL_PROGRAM@ -o bin -g bin -m 755 util/privatepw/privatepw $(DESTDIR)/@sbindir@/privatepw
 +	-@mkdir -p $(DESTDIR)/@libexecdir@
 +	-@mkdir -p $(DESTDIR)/@datadir@/examples/wu-ftpd
-+	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpd $(DESTDIR)/@libexecdir@/ftpd
- 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpshut $(DESTDIR)/@sbindir@/ftpshut
- 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpcount $(DESTDIR)/@bindir@/ftpcount
- 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftpwho $(DESTDIR)/@bindir@/ftpwho
--	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ckconfig $(DESTDIR)/@sbindir@/ckconfig
-+	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ckconfig $(DESTDIR)/@sbindir@/ftpckconfig
- 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 bin/ftprestart $(DESTDIR)/@sbindir@/ftprestart
- 	@INSTALL_PROGRAM@ -o bin -g bin -m 755 util/privatepw/privatepw $(DESTDIR)/@sbindir@/privatepw
++	@INSTALL_PROGRAM@ bin/ftpd $(DESTDIR)/@libexecdir@/ftpd
++	@INSTALL_PROGRAM@ bin/ftpshut $(DESTDIR)/@sbindir@/ftpshut
++	@INSTALL_PROGRAM@ bin/ftpcount $(DESTDIR)/@bindir@/ftpcount
++	@INSTALL_PROGRAM@ bin/ftpwho $(DESTDIR)/@bindir@/ftpwho
++	@INSTALL_PROGRAM@ bin/ckconfig $(DESTDIR)/@sbindir@/ftpckconfig
++	@INSTALL_PROGRAM@ bin/ftprestart $(DESTDIR)/@sbindir@/ftprestart
++	@INSTALL_PROGRAM@ util/privatepw/privatepw $(DESTDIR)/@sbindir@/privatepw
  	@echo installing manpages.
-@@ -87,5 +89,6 @@
- 	@INSTALL_DATA@ -o bin -g bin -m 644 doc/xferlog.5 $(DESTDIR)/$(mandir)/man5/xferlog.5
- 	@INSTALL_DATA@ -o bin -g bin -m 644 doc/ftprestart.8 $(DESTDIR)/$(mandir)/man8/ftprestart.8
- 	@INSTALL_DATA@ -o bin -g bin -m 644 util/privatepw/privatepw.8 $(DESTDIR)/$(mandir)/man8/privatepw.8
+ 	-@mkdir -p $(mandir)
+-	@INSTALL_DATA@ -o bin -g bin -m 644 doc/ftpd.8 $(DESTDIR)/$(mandir)/man8/ftpd.8
+-	@INSTALL_DATA@ -o bin -g bin -m 644 doc/ftpcount.1 $(DESTDIR)/$(mandir)/man1/ftpcount.1
+-	@INSTALL_DATA@ -o bin -g bin -m 644 doc/ftpwho.1 $(DESTDIR)/$(mandir)/man1/ftpwho.1
+-	@INSTALL_DATA@ -o bin -g bin -m 644 doc/ftpshut.8 $(DESTDIR)/$(mandir)/man8/ftpshut.8
+-	@INSTALL_DATA@ -o bin -g bin -m 644 doc/ftpaccess.5 $(DESTDIR)/$(mandir)/man5/ftpaccess.5
+-	@INSTALL_DATA@ -o bin -g bin -m 644 doc/ftphosts.5 $(DESTDIR)/$(mandir)/man5/ftphosts.5
+-	@INSTALL_DATA@ -o bin -g bin -m 644 doc/ftpconversions.5 $(DESTDIR)/$(mandir)/man5/ftpconversions.5
+-	@INSTALL_DATA@ -o bin -g bin -m 644 doc/ftpservers.5 $(DESTDIR)/$(mandir)/man5/ftpservers.5
+-	@INSTALL_DATA@ -o bin -g bin -m 644 doc/xferlog.5 $(DESTDIR)/$(mandir)/man5/xferlog.5
+-	@INSTALL_DATA@ -o bin -g bin -m 644 doc/ftprestart.8 $(DESTDIR)/$(mandir)/man8/ftprestart.8
+-	@INSTALL_DATA@ -o bin -g bin -m 644 util/privatepw/privatepw.8 $(DESTDIR)/$(mandir)/man8/privatepw.8
 -	@if test ! -f $(DESTDIR)/@ETCDIR@/ftpaccess; then echo "Since you didn't have a ftpaccess file, the sample has been"; echo "installed to $(DESTDIR)/@ETCDIR@/ftpaccess."; echo "You will probably want to edit it."; @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpaccess $(DESTDIR)/@ETCDIR@/ftpaccess; fi
 -	@if test ! -f $(DESTDIR)/@ETCDIR@/ftpconversions; then echo "Since you didn't have a ftpconversions file, the sample has been"; echo "installed to $(DESTDIR)/@ETCDIR@/ftpconversions."; echo "You will probably want to edit it."; @INSTALL@ -c -o bin -g bin -m 644 doc/examples/ftpconversions $(DESTDIR)/@ETCDIR@/ftpconversions; fi
-+	@INSTALL_DATA@ -c -o bin -g bin -m 644 doc/examples/ftpaccess $(DESTDIR)/@datadir@/examples/wu-ftpd/ftpaccess.example
-+	@INSTALL_DATA@ -c -o bin -g bin -m 644 doc/examples/ftpconversions $(DESTDIR)/@datadir@/examples/wu-ftpd/ftpconversions.example
-+	@INSTALL_DATA@ -c -o bin -g bin -m 644 doc/examples/ftpusers $(DESTDIR)/@datadir@/examples/wu-ftpd/ftpusers.example
++	@INSTALL_DATA@ doc/ftpd.8 $(DESTDIR)/$(mandir)/man8/ftpd.8
++	@INSTALL_DATA@ doc/ftpcount.1 $(DESTDIR)/$(mandir)/man1/ftpcount.1
++	@INSTALL_DATA@ doc/ftpwho.1 $(DESTDIR)/$(mandir)/man1/ftpwho.1
++	@INSTALL_DATA@ doc/ftpshut.8 $(DESTDIR)/$(mandir)/man8/ftpshut.8
++	@INSTALL_DATA@ doc/ftpaccess.5 $(DESTDIR)/$(mandir)/man5/ftpaccess.5
++	@INSTALL_DATA@ doc/ftphosts.5 $(DESTDIR)/$(mandir)/man5/ftphosts.5
++	@INSTALL_DATA@ doc/ftpconversions.5 $(DESTDIR)/$(mandir)/man5/ftpconversions.5
++	@INSTALL_DATA@ doc/ftpservers.5 $(DESTDIR)/$(mandir)/man5/ftpservers.5
++	@INSTALL_DATA@ doc/xferlog.5 $(DESTDIR)/$(mandir)/man5/xferlog.5
++	@INSTALL_DATA@ doc/ftprestart.8 $(DESTDIR)/$(mandir)/man8/ftprestart.8
++	@INSTALL_DATA@ util/privatepw/privatepw.8 $(DESTDIR)/$(mandir)/man8/privatepw.8
++	@INSTALL_DATA@ -c doc/examples/ftpaccess $(DESTDIR)/@datadir@/examples/wu-ftpd/ftpaccess.example
++	@INSTALL_DATA@ -c doc/examples/ftpconversions $(DESTDIR)/@datadir@/examples/wu-ftpd/ftpconversions.example
++	@INSTALL_DATA@ -c doc/examples/ftpusers $(DESTDIR)/@datadir@/examples/wu-ftpd/ftpusers.example