Honor PKG_SYSCONFDIR and VARBASE, noticed in PR 36501.

  OLD LOCATION				NEW LOCATION
  /var/run/dtcpclient.pid		${VARBASE}/run/dtcpclient.pid
  ${PREFIX}/etc/dtcpclient.auth		${PKG_SYSCONFDIR}/dtcpclient.auth
  /usr/local/dtcpclient_script.conf	${PKG_SYSCONFDIR}/dtcpclient_script.conf

7 files changed, 39 insertions, 36 deletions

diff --git a/net/dtcpclient/MESSAGE b/net/dtcpclient/MESSAGE
index cf494aee001..2191ed05472 100644
--- a/net/dtcpclient/MESSAGE
+++ b/net/dtcpclient/MESSAGE
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2005/01/23 05:07:43 hamajima Exp $
+$NetBSD: MESSAGE,v 1.2 2007/06/17 04:23:32 obache Exp $
 
-If your password is found in ${PREFIX}/etc/dtcpclient.auth, dtcpclient does
+If your password is found in ${PKG_SYSCONFDIR}/dtcpclient.auth, dtcpclient does
 not ask for your password.  The format is a colon-separated list of the
 server name, the user name, and the password.
 
diff --git a/net/dtcpclient/Makefile b/net/dtcpclient/Makefile
index 9945e891fdb..50e71a84a20 100644
--- a/net/dtcpclient/Makefile
+++ b/net/dtcpclient/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2007/03/24 19:21:29 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2007/06/17 04:23:32 obache Exp $
 #
 
 DISTNAME=	dtcpclient-20060526
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.imasy.or.jp/~ume/ipv6/ \
 		http://home.jp.FreeBSD.org/~ume/ipv6/
@@ -17,11 +18,15 @@ RCD_SCRIPTS=	dtcpclient
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
-SUBST_STAGE.paths=	post-patch
-SUBST_FILES.paths=	dtcpclient.8
-SUBST_SED.paths=	's|/usr/local|${PREFIX}|g'
+SUBST_STAGE.paths=	post-configure
+SUBST_FILES.paths=	dtcpclient.8 dtcpclient.script dtcpclient.c
+SUBST_SED.paths=	-e 's|/usr/local/etc|${PKG_SYSCONFDIR}|g'
+SUBST_SED.paths+=	-e 's|/usr/local|${PREFIX}|g'
+SUBST_SED.paths+=	-e 's|/var|${VARBASE}|g'
 
-MAKE_ENV+=	${BSD_MAKE_ENV}
+MAKE_ENV+=	${BSD_MAKE_ENV} VARBASE=${VARBASE}
+
+BUILD_DEFS+=	VARBASE
 
 INSTALLATION_DIRS=	${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 sbin
 
diff --git a/net/dtcpclient/distinfo b/net/dtcpclient/distinfo
index 81a725e4b90..127e858bdd7 100644
--- a/net/dtcpclient/distinfo
+++ b/net/dtcpclient/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2006/08/27 14:00:41 hamajima Exp $
+$NetBSD: distinfo,v 1.6 2007/06/17 04:23:32 obache Exp $
 
 SHA1 (dtcpclient-20060526.tar.gz) = bcafcfbc90a64dbb8f9f3104ebcacd43a3222aa7
 RMD160 (dtcpclient-20060526.tar.gz) = 60c4d85cb71af8514cf3ab50dcc4a5bb47994e4b
 Size (dtcpclient-20060526.tar.gz) = 13571 bytes
-SHA1 (patch-aa) = 100975f5578392446a812feb9286ce5ff0758657
-SHA1 (patch-ab) = d4b7c355da9000898944ccd0470db0ed5655f771
-SHA1 (patch-ac) = cfa76050a40badd4e65dee2f9a177ba73b545bc3
+SHA1 (patch-aa) = 4a3700c367d0fd0b3d5ad9db8f43ace6a1d13915
+SHA1 (patch-ab) = 235e037b7fee523e3039ed94497136885eb43277
+SHA1 (patch-ac) = 9381b548d5602509317ff363e8166c5833dd990c
diff --git a/net/dtcpclient/files/dtcpclient.sh b/net/dtcpclient/files/dtcpclient.sh
index 097363f0b37..2eaea3f80e8 100644
--- a/net/dtcpclient/files/dtcpclient.sh
+++ b/net/dtcpclient/files/dtcpclient.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD: ports/net/dtcpclient/files/dtcpclient.sh,v 1.5 2004/06/11 15:49:48 ume Exp $
-# $NetBSD: dtcpclient.sh,v 1.1.1.1 2005/01/23 05:07:43 hamajima Exp $
+# $NetBSD: dtcpclient.sh,v 1.2 2007/06/17 04:23:32 obache Exp $
 #
 
 # PROVIDE: dtcpclient
@@ -33,7 +33,7 @@ dtcpclient_flags=${dtcpclient_flags:-"-t network -Dl"}	# Flags to dtcpclient pro
 name="dtcpclient"
 rcvar=`set_rcvar`
 command="${prefix}/sbin/${name}"
-pidfile="/var/run/${name}.pid"
+pidfile="@VARBASE@/run/${name}.pid"
 extra_commands="reload"
 
 load_rc_config $name
diff --git a/net/dtcpclient/patches/patch-aa b/net/dtcpclient/patches/patch-aa
index 4ca8fc3158a..520c8fec904 100644
--- a/net/dtcpclient/patches/patch-aa
+++ b/net/dtcpclient/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2006/02/24 20:44:14 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2007/06/17 04:23:32 obache Exp $
 
---- Makefile.orig	2004-06-21 05:18:18.000000000 +0000
+--- Makefile.orig	2005-12-28 07:29:24.000000000 +0000
 +++ Makefile
 @@ -34,18 +34,14 @@ PROG=		dtcpclient
  MAN=		dtcpclient.8
@@ -17,7 +17,8 @@ $NetBSD: patch-aa,v 1.2 2006/02/24 20:44:14 joerg Exp $
 -.endif
 +MANDIR=		$(PREFIX)/${PKGMANDIR}
  
- CFLAGS+=	-Wall -DPREFIX=\"$(PREFIX)\"
+-CFLAGS+=	-Wall -DPREFIX=\"$(PREFIX)\"
++CFLAGS+=	-Wall -DPREFIX=\"$(PREFIX)\" -DSYSCONFDIR=\"$(PKG_SYSCONFDIR)\" -DVARBASE=\"$(VARBASE)\"
  
 -.if ($(OPSYS) == "FreeBSD")
 +.if ($(OPSYS) == "FreeBSD") || ${OPSYS} == "DragonFly"
diff --git a/net/dtcpclient/patches/patch-ab b/net/dtcpclient/patches/patch-ab
index 9cd749e4e1c..cc4d07c27f2 100644
--- a/net/dtcpclient/patches/patch-ab
+++ b/net/dtcpclient/patches/patch-ab
@@ -1,29 +1,22 @@
-$NetBSD: patch-ab,v 1.1 2006/02/24 20:44:14 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2007/06/17 04:23:32 obache Exp $
 
---- dtcpclient.8.orig	2005-05-21 08:03:05.000000000 +0000
+--- dtcpclient.8.orig	2006-05-25 16:36:21.000000000 +0000
 +++ dtcpclient.8
-@@ -103,7 +103,7 @@ The default is
+@@ -122,7 +122,7 @@ The default is
  .It Fl s Ar script
  Specify the command to invoke on DTCP session is established or
  closed.  The default is
 -.Pa /usr/local/etc/dtcpclient.script .
-+.Pa /usr/pkg/sbin/dtcpclient-script .
++.Pa /usr/local/sbin/dtcpclient-script .
  .It Fl t Ar tuntype
  The spec defines several kind of tunnel requests.
  .Nm
-@@ -180,13 +180,13 @@ tunnel type .
- .\"
- .Sh FILES
- .Bl -tag -width "        " -compact
--.It Pa /usr/local/etc/dtcpclient.auth
-+.It Pa /usr/pkg/etc/dtcpclient.auth
- You can specify your password to connect to DTCP server in this file.
- If your password is found in this file,
+@@ -214,7 +214,7 @@ If your password is found in this file,
  .Nm
  does not ask for your password.  The format is a colon-separated list of
  the server name, the user name and the password.
 -.It Pa /usr/local/etc/dtcpclient.script
-+.It Pa /usr/pkg/sbin/dtcpclient-script
++.It Pa /usr/local/sbin/dtcpclient-script
  Default script invoked for setup or cleanup tunnel when DTCP session
  is established or closed.
  .It Pa /var/run/dtcpclient.pid
diff --git a/net/dtcpclient/patches/patch-ac b/net/dtcpclient/patches/patch-ac
index 16842ed4636..84513ffe4b7 100644
--- a/net/dtcpclient/patches/patch-ac
+++ b/net/dtcpclient/patches/patch-ac
@@ -1,17 +1,21 @@
-$NetBSD: patch-ac,v 1.2 2006/08/27 14:00:41 hamajima Exp $
+$NetBSD: patch-ac,v 1.3 2007/06/17 04:23:32 obache Exp $
 
---- dtcpclient.c.orig	2006-05-26 01:36:21.000000000 +0900
-+++ dtcpclient.c	2006-08-26 01:11:31.000000000 +0900
-@@ -74,7 +74,7 @@
+--- dtcpclient.c.orig	2006-05-25 16:36:21.000000000 +0000
++++ dtcpclient.c
+@@ -72,9 +72,9 @@
+ #define PREFIX		"/usr/local"
+ #endif
  
- #define PIDFILE		_PATH_VARRUN "/dtcpclient.pid"
- #define PASSWDFILE	PREFIX "/etc/dtcpclient.auth"
+-#define PIDFILE		_PATH_VARRUN "/dtcpclient.pid"
+-#define PASSWDFILE	PREFIX "/etc/dtcpclient.auth"
 -#define SCRIPTFLIE	PREFIX "/etc/dtcpclient.script"
++#define PIDFILE		VARBASE "/run/dtcpclient.pid"
++#define PASSWDFILE	SYSCONFDIR "/dtcpclient.auth"
 +#define SCRIPTFLIE	PREFIX "/sbin/dtcpclient-script"
  
  typedef enum {
  	FALSE = 0,
-@@ -173,9 +173,9 @@
+@@ -173,9 +173,9 @@ authenticate(char *user, char *challenge
  	int i;
  
  	MD5Init(&ctx);