Applied feedback from Hideyuki KURASHINA in pkg/25776.

And fix path in manpage.

4 files changed, 23 insertions, 7 deletions

diff --git a/net/dtcp/MESSAGE b/net/dtcp/MESSAGE
new file mode 100644
index 00000000000..b7b60a786e8
--- /dev/null
+++ b/net/dtcp/MESSAGE
@@ -0,0 +1,8 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2004/06/22 16:08:27 hamajima Exp $
+
+You can specify your password to connect to DTCP server.  If your password
+is found in ${PREFIX}/etc/dtcpc.auth, dtcpc don't ask you your password.
+The format is a collon separated list of the server name, the user name and
+password.
+===========================================================================
diff --git a/net/dtcp/Makefile b/net/dtcp/Makefile
index 30305b3a12d..3a810dfc9ce 100644
--- a/net/dtcp/Makefile
+++ b/net/dtcp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/06/05 07:43:25 hamajima Exp $
+# $NetBSD: Makefile,v 1.2 2004/06/22 16:08:27 hamajima Exp $
 #
 
 DISTNAME=	dtcp-20030228
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.imasy.or.jp/~ume/ipv6/ \
 		http://home.jp.FreeBSD.org/~ume/ipv6/
@@ -16,4 +17,11 @@ DEPENDS+=	qpopper-*:../../mail/qpopper
 RCD_SCRIPTS=	dtcpc dtcps
 CONF_DEPENDS=	YES
 
+post-configure:
+	@cd ${WRKSRC} && \
+	for f in dtcpauth.8 dtcpc.8 dtcps.8 ; do		\
+		${MV} $$f $$f.orig;				\
+		${SED} 's|/usr/local|${PREFIX}|g' $$f.orig > $$f;	\
+	done
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/dtcp/files/dtcpc.sh b/net/dtcp/files/dtcpc.sh
index 51a94af2cf6..10c12dac7b9 100755
--- a/net/dtcp/files/dtcpc.sh
+++ b/net/dtcp/files/dtcpc.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD: /repoman/r/pcvs/ports/net/dtcp/files/dtcpc.sh,v 1.1 2004/04/19 18:40:52 ume Exp $
-# $NetBSD: dtcpc.sh,v 1.1.1.1 2004/06/05 07:43:25 hamajima Exp $
+# $NetBSD: dtcpc.sh,v 1.2 2004/06/22 16:08:27 hamajima Exp $
 #
 
 # PROVIDE: dtcpc
@@ -22,7 +22,7 @@ prefix=@PREFIX@
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
-dtcpc_enable=${dtcpc_enable:-"NO"}		# Enable dtcpc
+#dtcpc=${dtcpc_enable:-"NO"}			# Enable dtcpc
 #dtcpc_program="${prefix}/sbin/dtcpc"		# Location of dtcpc
 dtcpc_server=${dtcpc_server:-""}		# DTCP server name
 dtcpc_username=${dtcpc_username:-""}		# DTCP user name
@@ -38,5 +38,5 @@ pidfile="/var/run/${name}.pid"
 extra_commands="reload"
 
 load_rc_config $name
-command_args="${dtcpc_flags} -u ${dtcpc_username} ${dtcpc_server}"
+command_args="-u ${dtcpc_username} ${dtcpc_server}"
 run_rc_command "$1"
diff --git a/net/dtcp/files/dtcps.sh b/net/dtcp/files/dtcps.sh
index 102db28cf4c..919474c58e8 100755
--- a/net/dtcp/files/dtcps.sh
+++ b/net/dtcp/files/dtcps.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD: /repoman/r/pcvs/ports/net/dtcp/files/dtcps.sh,v 1.1 2004/04/19 18:40:52 ume Exp $
-# $NetBSD: dtcps.sh,v 1.1.1.1 2004/06/05 07:43:25 hamajima Exp $
+# $NetBSD: dtcps.sh,v 1.2 2004/06/22 16:08:27 hamajima Exp $
 #
 
 # PROVIDE: dtcps
@@ -22,7 +22,7 @@ prefix=@PREFIX@
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
-dtcps_enable=${dtcps_enable:-"NO"}		# Enable dtcps
+#dtcps=${dtcps:-"NO"}				# Enable dtcps
 #dtcps_program="${prefix}/sbin/dtcps"		# Location of dtcps
 dtcps_tunif=${dtcps_tunif:-""}			# tunnel interface
 dtcps_prefix=${dtcps_prefix:-""}		# prefix for host tunnel type
@@ -60,5 +60,5 @@ dtcps_prestart() {
 }
 
 load_rc_config $name
-command_args="-i ${dtcps_tunif} ${dtcps_flags} ${dtcps_prefix}"
+command_args="-i ${dtcps_tunif} ${dtcps_prefix}"
 run_rc_command "$1"