PKG_DESTDIR_SUPPORT

4 files changed, 38 insertions, 4 deletions

diff --git a/net/rdist6/Makefile b/net/rdist6/Makefile
index 9763e5e7e3c..f08192a1843 100644
--- a/net/rdist6/Makefile
+++ b/net/rdist6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/03/15 20:43:24 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2009/06/06 00:48:39 abs Exp $
 #
 
 DISTNAME=	freerdist-0.92
@@ -20,12 +20,14 @@ MAKE_ENV+=	RDIST6_NAME=${RDIST6_NAME:Q}
 
 CONFLICTS=	rdist6-[0-9]*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 post-extract:
 	${CP} ${FILESDIR}/os-dragonfly.h ${WRKSRC}/config
 	${ECHO} LIB_SYS=-lcompat > ${WRKSRC}/config/mf.dragonfly
 
 post-install:
-	@strip ${PREFIX}/bin/${RDIST6_NAME}
-	@strip ${PREFIX}/bin/rdistd
+	@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 8324080667d..878332708d9 100644
--- a/net/rdist6/distinfo
+++ b/net/rdist6/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2008/05/20 20:21:25 tnn Exp $
+$NetBSD: distinfo,v 1.11 2009/06/06 00:48:39 abs Exp $
 
 SHA1 (freerdist-0.92.tar.gz) = 84db4efd8d223a7e10d62e386349aa9236f71ae3
 RMD160 (freerdist-0.92.tar.gz) = 2106cbf21fbe6fda2738d2e9e2d750625eb8c2da
@@ -10,7 +10,9 @@ SHA1 (patch-ad) = 89500d25dc2fb34c0295836f7ab18433218c85ea
 SHA1 (patch-ae) = 2bcbce70c6228b34c13082e6a2b82f67f02389f8
 SHA1 (patch-af) = c91cfab8609a6b8fe0df051ac8a2d29154ff5aad
 SHA1 (patch-ag) = 0049876208f0466b6a725bb4bc04097ed603c89c
+SHA1 (patch-ah) = 3e1002868db92bec7bfa412e1fff1521f61c4330
 SHA1 (patch-ai) = 3f96e7440fe4ac5d6180a4137806fe70e2033565
 SHA1 (patch-aj) = db6307ff40a8db7428fc23f7cfd40a3152c465dc
 SHA1 (patch-ak) = a65735786a4cbe19874e83cdc8ac2d6aadb8c14e
 SHA1 (patch-al) = f40942171206e5191051bf3e699d4c1977a4deb1
+SHA1 (patch-am) = 37f1a4ee1d6d14274618eef9d53a20b77ed44c0f
diff --git a/net/rdist6/patches/patch-ah b/net/rdist6/patches/patch-ah
new file mode 100644
index 00000000000..aca1322fe53
--- /dev/null
+++ b/net/rdist6/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.3 2009/06/06 00:48:39 abs Exp $
+
+--- src/Makefile.real.orig	1999-08-04 16:57:32.000000000 +0100
++++ src/Makefile.real
+@@ -80,8 +80,8 @@ clean:
+ 
+ install: $(CLIENT_BIN) $(SERVER_BIN)
+ 	$(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} \
+-		$(SERVER_BIN) $(BIN_DIR)/$(SERVER)
++		$(SERVER_BIN) $(DESTDIR)$(BIN_DIR)/$(SERVER)
+ 
+ install.man:
diff --git a/net/rdist6/patches/patch-am b/net/rdist6/patches/patch-am
new file mode 100644
index 00000000000..0beeae660a7
--- /dev/null
+++ b/net/rdist6/patches/patch-am
@@ -0,0 +1,15 @@
+$NetBSD: patch-am,v 1.1 2009/06/06 00:48:39 abs Exp $
+
+--- doc/Makefile.real.orig	1995-05-21 00:35:25.000000000 +0100
++++ doc/Makefile.real
+@@ -45,8 +45,8 @@ doc:
+ install:
+ 
+ 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}
+ 
+ clean:
+ 	rm -f ${CLEANFILES}