From 572e5b5580a209a12df855311c68bf48ba4a1d56 Mon Sep 17 00:00:00 2001
From: jmmv <jmmv>
Date: Wed, 2 Jul 2003 17:42:11 +0000
Subject: Honour PKG_SYSCONFDIR.  Bump PKGREVISION to 2.

---
 sysutils/mtoolsfm/Makefile         | 15 ++++++++++++---
 sysutils/mtoolsfm/distinfo         |  4 ++--
 sysutils/mtoolsfm/patches/patch-aa | 10 +++++-----
 3 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'sysutils')

diff --git a/sysutils/mtoolsfm/Makefile b/sysutils/mtoolsfm/Makefile
index 072914d6ab2..f444d39ba05 100644
--- a/sysutils/mtoolsfm/Makefile
+++ b/sysutils/mtoolsfm/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/05/05 19:05:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/02 17:42:11 jmmv Exp $
 #
 
 DISTNAME=	MToolsFM-1.9-3
 PKGNAME=	mtoolsfm-1.9.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.core-coutainville.org/MToolsFM/archive/SOURCES/
 
@@ -14,8 +14,17 @@ COMMENT=	Easy MS-DOS disk access without learning MS-DOS commands
 DEPENDS+=	mtools>=3.9.7:../../sysutils/mtools
 
 USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-conffile=${PREFIX}/etc/mtoolsfm.conf
+CONFIGURE_ARGS+=	--with-conffile=${PKG_SYSCONFDIR}/mtoolsfm.conf
+
+post-extract:
+	cd ${WRKSRC} && ${MV} MToolsFM.1 MToolsFM.1.in
+
+pre-configure:
+	cd ${WRKSRC} && ${SED} \
+		-e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g' \
+		< MToolsFM.1.in > MToolsFM.1
 
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mtoolsfm/distinfo b/sysutils/mtoolsfm/distinfo
index 0f9f3bc62a9..012f6f363e6 100644
--- a/sysutils/mtoolsfm/distinfo
+++ b/sysutils/mtoolsfm/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/06/09 22:47:51 agc Exp $
+$NetBSD: distinfo,v 1.2 2003/07/02 17:42:11 jmmv Exp $
 
 SHA1 (MToolsFM-1.9-3.tar.gz) = f2d5428cf277b9dc71d9b96661543c155be7d30f
 Size (MToolsFM-1.9-3.tar.gz) = 177388 bytes
-SHA1 (patch-aa) = f58495e0290736bd92720ae51d493f906937af8e
+SHA1 (patch-aa) = fb08f6b930a48a4b289ddb78e0961488b0228efe
diff --git a/sysutils/mtoolsfm/patches/patch-aa b/sysutils/mtoolsfm/patches/patch-aa
index 11140380fea..04a6fc87625 100644
--- a/sysutils/mtoolsfm/patches/patch-aa
+++ b/sysutils/mtoolsfm/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/09 22:47:51 agc Exp $
+$NetBSD: patch-aa,v 1.2 2003/07/02 17:42:12 jmmv Exp $
 
---- MToolsFM.1.orig	Sat Aug 11 18:26:43 2001
-+++ MToolsFM.1
+--- MToolsFM.1.in.orig	Sat Aug 11 18:26:43 2001
++++ MToolsFM.1.in
 @@ -20,7 +20,7 @@
  .TP
  .B \-\-nosysconf
  Do not attempt to read system-wide configuration in
 -.IR /etc/mtoolsfm.conf .
-+.IR /usr/pkg/etc/mtoolsfm.conf .
++.IR @PKG_SYSCONFDIR@/mtoolsfm.conf .
  .TP
  .B \-\-nouserconf
  Do not read user config file in
@@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/06/09 22:47:51 agc Exp $
  User-based initialization file
  .TP
 -/etc/mtoolsfm.conf
-+/usr/pkg/etc/mtoolsfm.conf
++@PKG_SYSCONFDIR@/mtoolsfm.conf
  System-wide initialization file
  .SH DIAGNOSTICS
  Diagnostics appear in a little textfield at the bottom of the main window.
-- 
cgit v1.2.3