Adjust ${PREFIX} dynamically so that man pages and programs work properly.

5 files changed, 17 insertions, 10 deletions

diff --git a/net/uucp/Makefile b/net/uucp/Makefile
index 33672448c19..a66953a681e 100644
--- a/net/uucp/Makefile
+++ b/net/uucp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/03/15 20:02:18 christos Exp $
+# $NetBSD: Makefile,v 1.5 2007/03/16 17:52:25 christos Exp $
 
 DISTNAME=	uucp-1.07
 PKGREVISION=	2
@@ -60,8 +60,11 @@ post-configure:
 	@${ECHO} "#define ${_var_}	\""${UUCP_${_var_}:Q}"\""	\
 		>> ${WRKSRC}/policy_local.h
 .endfor
-	${MKDIR} ${WRKSRC}/rmail ${WRKSRC}/uucpd
-	${CP} ${FILESDIR}/rmail/[a-zM]* ${WRKSRC}/rmail
-	${CP} ${FILESDIR}/uucpd/[a-zM]* ${WRKSRC}/uucpd
+.for _var_ in rmail uucpd
+	@${MKDIR} ${WRKSRC}/${_var_}
+	@(cd ${FILESDIR}/${_var_} && for f in [a-zM]*; do \
+	    ${SED} -e "s,@PREFIX@,${PREFIX}," < $$f > ${WRKSRC}/${_var_}/$$f; \
+	 done)
+.endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/uucp/files/rmail/Makefile b/net/uucp/files/rmail/Makefile
index 346d4d4438b..8d0d7af31bc 100644
--- a/net/uucp/files/rmail/Makefile
+++ b/net/uucp/files/rmail/Makefile
@@ -1,7 +1,9 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/15 20:02:20 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2007/03/16 17:52:29 christos Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	rmail
 MAN=	rmail.8
+BINDIR=	@PREFIX@/bin
+MANDIR= @PREFIX@/man
 
 .include <bsd.prog.mk>
diff --git a/net/uucp/files/uucpd/Makefile b/net/uucp/files/uucpd/Makefile
index 318c3b7fdd1..a655c95a17b 100644
--- a/net/uucp/files/uucpd/Makefile
+++ b/net/uucp/files/uucpd/Makefile
@@ -1,8 +1,10 @@
-#	$NetBSD: Makefile,v 1.1 2007/03/15 20:02:20 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2007/03/16 17:52:30 christos Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
 
 PROG=	uucpd
 MAN=	uucpd.8
+BINDIR=	@PREFIX@/libexec
+MANDIR=	@PREFIX@/man
 LDADD+= -lcrypt -lutil
 DPADD+=	${LIBCRYPT} ${LIBUTIL}
 CPPFLAGS+=-DSUPPORT_UTMP -DSUPPORT_UTMPX
diff --git a/net/uucp/files/uucpd/pathnames.h b/net/uucp/files/uucpd/pathnames.h
index 41ec17b86d6..a10ef6cf61e 100644
--- a/net/uucp/files/uucpd/pathnames.h
+++ b/net/uucp/files/uucpd/pathnames.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pathnames.h,v 1.1 2007/03/15 20:02:20 christos Exp $	*/
+/*	$NetBSD: pathnames.h,v 1.2 2007/03/16 17:52:30 christos Exp $	*/
 
 /*
  * Copyright (c) 1989 The Regents of the University of California.
@@ -33,4 +33,4 @@
 
 #include <paths.h>
 
-#define	_PATH_UUCICO	"/usr/libexec/uucp/uucico"
+#define	_PATH_UUCICO	"@PREFIX@/libexec/uucp/uucico"
diff --git a/net/uucp/files/uucpd/uucpd.8 b/net/uucp/files/uucpd/uucpd.8
index 301d77a9809..cf322204436 100644
--- a/net/uucp/files/uucpd/uucpd.8
+++ b/net/uucp/files/uucpd/uucpd.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: uucpd.8,v 1.1 2007/03/15 20:02:20 christos Exp $
+.\"	$NetBSD: uucpd.8,v 1.2 2007/03/16 17:52:30 christos Exp $
 .\"
 .\" Copyright (c) 1998 Matthew R. Green
 .\" All rights reserved.
@@ -48,7 +48,7 @@ file transfer daemon, if the following conditions are met:
 the username and password match a valid account
 .It
 the accounts shell is
-.Dq /usr/libexec/uucp/uucico .
+.Dq @PREFIX@/libexec/uucp/uucico .
 .El
 .Pp
 .Nm