From 2088cf52afa10a0eef22d3f69144131918ffb377 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Mon, 16 Jul 2007 21:50:12 +0000
Subject: Fix some pathes in the default configuration. Bump revision.

---
 sysutils/dfuibe_installer/Makefile         | 11 ++++++++++-
 sysutils/dfuibe_installer/distinfo         |  3 ++-
 sysutils/dfuibe_installer/patches/patch-aa | 19 +++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 sysutils/dfuibe_installer/patches/patch-aa

diff --git a/sysutils/dfuibe_installer/Makefile b/sysutils/dfuibe_installer/Makefile
index 7e42d24a938..3b1c22a79c3 100644
--- a/sysutils/dfuibe_installer/Makefile
+++ b/sysutils/dfuibe_installer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2007/07/16 21:38:39 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2007/07/16 21:50:12 joerg Exp $
 #
 
 DISTNAME=	dfuibe_installer-1.1.7
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.pkgsrc-box.org/bsdinstaller/distfiles/
 
@@ -14,6 +15,14 @@ USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=	msgfmt
 MAKE_ENV+=	LOCALEDIR=${PREFIX:Q}/${PKGLOCALEDIR:Q}/locale
 
+SUBST_CLASSES+=	tools
+SUBST_STAGE.tools=	pre-configure
+SUBST_MESSAGE.tools=	Fixing references to tools
+SUBST_FILES.tools=	conf/cmdnames.conf
+SUBST_VARS.tools=	REL_PKG_TOOLS_BIN
+
+REL_PKG_TOOLS_BIN=	${PKG_TOOLS_BIN:S/\///}
+
 .include "../../devel/libaura/buildlink3.mk"
 .include "../../devel/libdfui/buildlink3.mk"
 .include "../../devel/libinstaller/buildlink3.mk"
diff --git a/sysutils/dfuibe_installer/distinfo b/sysutils/dfuibe_installer/distinfo
index b173bbfa88f..42e866564ed 100644
--- a/sysutils/dfuibe_installer/distinfo
+++ b/sysutils/dfuibe_installer/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2006/06/20 23:13:18 jlam Exp $
+$NetBSD: distinfo,v 1.5 2007/07/16 21:50:13 joerg Exp $
 
 SHA1 (dfuibe_installer-1.1.7.tar.gz) = 5f6d2937642f443e015e6e4acaa4953f769a3cd7
 RMD160 (dfuibe_installer-1.1.7.tar.gz) = 8642f721a43c91b42150c98d54eed2b6e70cdf77
 Size (dfuibe_installer-1.1.7.tar.gz) = 59792 bytes
+SHA1 (patch-aa) = 90ba994b756eaa766ea82f8ab2b5179837433448
diff --git a/sysutils/dfuibe_installer/patches/patch-aa b/sysutils/dfuibe_installer/patches/patch-aa
new file mode 100644
index 00000000000..9b36ec6493d
--- /dev/null
+++ b/sysutils/dfuibe_installer/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.3 2007/07/16 21:50:13 joerg Exp $
+
+--- conf/cmdnames.conf.orig	2007-07-16 21:09:01.000000000 +0000
++++ conf/cmdnames.conf
+@@ -85,10 +85,10 @@ PW=usr/sbin/pw
+ SWAPINFO=usr/sbin/swapinfo
+ BOOT0CFG=usr/sbin/boot0cfg
+ FDFORMAT=usr/sbin/fdformat
+-PKG_ADD=usr/sbin/pkg_add
+-PKG_DELETE=usr/sbin/pkg_delete
+-PKG_CREATE=usr/sbin/pkg_create
+-PKG_INFO=usr/sbin/pkg_info
++PKG_ADD=@REL_PKG_TOOLS_BIN@/pkg_add
++PKG_DELETE=@REL_PKG_TOOLS_BIN@/pkg_delete
++PKG_CREATE=@REL_PKG_TOOLS_BIN@/pkg_create
++PKG_INFO=@REL_PKG_TOOLS_BIN@/pkg_info
+ INETD=usr/sbin/inetd
+ 
+ TFTPD=usr/libexec/tftpd
-- 
cgit v1.2.3