Fix DESTDIR build. Use BSD_INSTALL_PROGRAM and drop manual stripping.

4 files changed, 17 insertions, 18 deletions

diff --git a/net/rdist6/Makefile b/net/rdist6/Makefile
index f08192a1843..21456a598e4 100644
--- a/net/rdist6/Makefile
+++ b/net/rdist6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/06/06 00:48:39 abs Exp $
+# $NetBSD: Makefile,v 1.19 2009/07/15 10:00:59 joerg Exp $
 #
 
 DISTNAME=	freerdist-0.92
@@ -26,8 +26,4 @@ post-extract:
 	${CP} ${FILESDIR}/os-dragonfly.h ${WRKSRC}/config
 	${ECHO} LIB_SYS=-lcompat > ${WRKSRC}/config/mf.dragonfly
 
-post-install:
-	@strip ${DESTDIR}${PREFIX}/bin/${RDIST6_NAME}
-	@strip ${DESTDIR}${PREFIX}/bin/rdistd
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/rdist6/distinfo b/net/rdist6/distinfo
index 878332708d9..6c1b5e5671d 100644
--- a/net/rdist6/distinfo
+++ b/net/rdist6/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2009/06/06 00:48:39 abs Exp $
+$NetBSD: distinfo,v 1.12 2009/07/15 10:00:59 joerg Exp $
 
 SHA1 (freerdist-0.92.tar.gz) = 84db4efd8d223a7e10d62e386349aa9236f71ae3
 RMD160 (freerdist-0.92.tar.gz) = 2106cbf21fbe6fda2738d2e9e2d750625eb8c2da
@@ -10,9 +10,9 @@ SHA1 (patch-ad) = 89500d25dc2fb34c0295836f7ab18433218c85ea
 SHA1 (patch-ae) = 2bcbce70c6228b34c13082e6a2b82f67f02389f8
 SHA1 (patch-af) = c91cfab8609a6b8fe0df051ac8a2d29154ff5aad
 SHA1 (patch-ag) = 0049876208f0466b6a725bb4bc04097ed603c89c
-SHA1 (patch-ah) = 3e1002868db92bec7bfa412e1fff1521f61c4330
+SHA1 (patch-ah) = 35bda080c8b816b1e76f643548679dacbc10d2af
 SHA1 (patch-ai) = 3f96e7440fe4ac5d6180a4137806fe70e2033565
 SHA1 (patch-aj) = db6307ff40a8db7428fc23f7cfd40a3152c465dc
 SHA1 (patch-ak) = a65735786a4cbe19874e83cdc8ac2d6aadb8c14e
 SHA1 (patch-al) = f40942171206e5191051bf3e699d4c1977a4deb1
-SHA1 (patch-am) = 37f1a4ee1d6d14274618eef9d53a20b77ed44c0f
+SHA1 (patch-am) = 26655eccc7b2051f42dc57004161263777c80f8d
diff --git a/net/rdist6/patches/patch-ah b/net/rdist6/patches/patch-ah
index aca1322fe53..6f97cd72130 100644
--- a/net/rdist6/patches/patch-ah
+++ b/net/rdist6/patches/patch-ah
@@ -1,15 +1,18 @@
-$NetBSD: patch-ah,v 1.3 2009/06/06 00:48:39 abs Exp $
+$NetBSD: patch-ah,v 1.4 2009/07/15 10:00:59 joerg Exp $
 
---- src/Makefile.real.orig	1999-08-04 16:57:32.000000000 +0100
+--- src/Makefile.real.orig	1999-08-04 17:57:32.000000000 +0200
 +++ src/Makefile.real
-@@ -80,8 +80,8 @@ clean:
+@@ -79,9 +79,9 @@ clean:
+ 		$(COMMONOBJS) $(MISSINGOBJS)
  
  install: $(CLIENT_BIN) $(SERVER_BIN)
- 	$(INSTALL) ${IN_ARGS} -o root -m ${RDIST_MODE} \
+-	$(INSTALL) ${IN_ARGS} -o root -m ${RDIST_MODE} \
 -		$(CLIENT_BIN) $(BIN_DIR)/$(CLIENT)
-+		$(CLIENT_BIN) $(DESTDIR)$(BIN_DIR)/$(CLIENT)
- 	$(INSTALL) ${IN_ARGS} -o ${BIN_OWNER} -m ${RDISTD_MODE} \
+-	$(INSTALL) ${IN_ARGS} -o ${BIN_OWNER} -m ${RDISTD_MODE} \
 -		$(SERVER_BIN) $(BIN_DIR)/$(SERVER)
++	${BSD_INSTALL_PROGRAM} \
++		$(CLIENT_BIN) $(DESTDIR)$(BIN_DIR)/$(CLIENT)
++	${BSD_INSTALL_PROGRAM} \
 +		$(SERVER_BIN) $(DESTDIR)$(BIN_DIR)/$(SERVER)
  
  install.man:
diff --git a/net/rdist6/patches/patch-am b/net/rdist6/patches/patch-am
index 0beeae660a7..d78cb100a49 100644
--- a/net/rdist6/patches/patch-am
+++ b/net/rdist6/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.1 2009/06/06 00:48:39 abs Exp $
+$NetBSD: patch-am,v 1.2 2009/07/15 10:00:59 joerg Exp $
 
---- doc/Makefile.real.orig	1995-05-21 00:35:25.000000000 +0100
+--- doc/Makefile.real.orig	1995-05-21 01:35:25.000000000 +0200
 +++ doc/Makefile.real
 @@ -45,8 +45,8 @@ doc:
  install:
@@ -8,8 +8,8 @@ $NetBSD: patch-am,v 1.1 2009/06/06 00:48:39 abs Exp $
  install.man: rdist.man rdistd.man
 -	${INSTALL} ${INSTALL_ARGS} rdist.man ${CLIENT_DEST}
 -	${INSTALL} ${INSTALL_ARGS} rdistd.man ${SERVER_DEST}
-+	${INSTALL} ${INSTALL_ARGS} rdist.man $(DESTDIR)${CLIENT_DEST}
-+	${INSTALL} ${INSTALL_ARGS} rdistd.man $(DESTDIR)${SERVER_DEST}
++	${BSD_INSTALL_MAN} rdist.man $(DESTDIR)${CLIENT_DEST}
++	${BSD_INSTALL_MAN} rdistd.man $(DESTDIR)${SERVER_DEST}
  
  clean:
  	rm -f ${CLEANFILES}