From e5c0b07001ec21ff466ee0a1c9c7f321bb4eeeb2 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Thu, 10 Apr 2008 21:19:19 +0000
Subject: + Use the options framework instead of using MTOOLS_ENABLE_FLOPPYD. +
 Convert to use PLIST_VARS instead of manually passing "@comment "   to the
 plist module.

Bump the PKGREVISION to 1 due to the options changes.
---
 sysutils/mtools/Makefile   | 23 ++++++-----------------
 sysutils/mtools/PLIST      | 10 +++++-----
 sysutils/mtools/options.mk | 19 +++++++++++++++++++
 3 files changed, 30 insertions(+), 22 deletions(-)
 create mode 100644 sysutils/mtools/options.mk

(limited to 'sysutils')

diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
index 53095db9aac..f9d1ca4a0e3 100644
--- a/sysutils/mtools/Makefile
+++ b/sysutils/mtools/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2007/12/09 23:38:21 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2008/04/10 21:19:19 jlam Exp $
 
 DISTNAME=	mtools-3.9.11
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://mtools.linux.lu/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,24 +12,12 @@ COMMENT=	FAT (MS-DOS, Atari) disk access tools
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-NOT_FOR_PLATFORM = *-*-alpha *-*-sparc64	# LP64 problem
+NOT_FOR_PLATFORM=	 *-*-alpha *-*-sparc64	# LP64 problem
 
-GNU_CONFIGURE=		YES
+GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake makeinfo
-INFO_FILES=		YES
+INFO_FILES=		yes
 
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(MTOOLS_ENABLE_FLOPPYD) && !empty(MTOOLS_ENABLE_FLOPPYD:M[Yy][Ee][Ss])
-BUILDLINK_DEPMETHOD.libXt?=	build
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-CPPFLAGS+=		-I${X11BASE}/include
-CONFIGURE_ARGS+=	--enable-floppyd
-PLIST_SUBST+=		NOFLOPPYD=
-.else
-CONFIGURE_ARGS+=	--disable-floppyd
-PLIST_SUBST+=		NOFLOPPYD="@comment "
-.endif
+.include "options.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mtools/PLIST b/sysutils/mtools/PLIST
index b6f56d4e025..4d831cc3d63 100644
--- a/sysutils/mtools/PLIST
+++ b/sysutils/mtools/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.8 2006/04/07 19:54:17 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2008/04/10 21:19:19 jlam Exp $
 bin/amuFormat.sh
-${NOFLOPPYD}bin/floppyd
-${NOFLOPPYD}bin/floppyd_installtest
+${PLIST.floppyd}bin/floppyd
+${PLIST.floppyd}bin/floppyd_installtest
 bin/lz
 bin/mattrib
 bin/mbadblocks
@@ -34,8 +34,8 @@ bin/mzip
 bin/tgz
 bin/uz
 info/mtools.info
-${NOFLOPPYD}man/man1/floppyd.1
-${NOFLOPPYD}man/man1/floppyd_installtest.1
+${PLIST.floppyd}man/man1/floppyd.1
+${PLIST.floppyd}man/man1/floppyd_installtest.1
 man/man1/mattrib.1
 man/man1/mbadblocks.1
 man/man1/mcat.1
diff --git a/sysutils/mtools/options.mk b/sysutils/mtools/options.mk
new file mode 100644
index 00000000000..b54e1a3536c
--- /dev/null
+++ b/sysutils/mtools/options.mk
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1 2008/04/10 21:19:19 jlam Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.mtools
+PKG_SUPPORTED_OPTIONS=		floppyd
+PKG_OPTIONS_LEGACY_VARS=	MTOOLS_ENABLE_FLOPPYD:floppyd
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		floppyd
+.if !empty(PKG_OPTIONS:Mfloppyd)
+BUILDLINK_DEPMETHOD.libXt?=	build
+.  include "../../x11/libX11/buildlink3.mk"
+.  include "../../x11/libXt/buildlink3.mk"
+CPPFLAGS+=		-I${X11BASE}/include
+CONFIGURE_ARGS+=	--enable-floppyd
+PLIST.floppyd=		yes
+.else
+CONFIGURE_ARGS+=	--disable-floppyd
+.endif
-- 
cgit v1.2.3