[pkgsrc/trunk]: pkgsrc/sysutils/mtools + Use the options framework instead of...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b5c13bab2be0
branches:  trunk
changeset: 540919:b5c13bab2be0
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Apr 10 21:19:19 2008 +0000

description:
+ 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.

diffstat:

 sysutils/mtools/Makefile   |  27 ++++++++-------------------
 sysutils/mtools/PLIST      |  10 +++++-----
 sysutils/mtools/options.mk |  19 +++++++++++++++++++
 3 files changed, 32 insertions(+), 24 deletions(-)

diffs (91 lines):

diff -r d788ee05d080 -r b5c13bab2be0 sysutils/mtools/Makefile
--- a/sysutils/mtools/Makefile  Thu Apr 10 20:56:33 2008 +0000
+++ b/sysutils/mtools/Makefile  Thu Apr 10 21:19:19 2008 +0000
@@ -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 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-NOT_FOR_PLATFORM = *-*-alpha *-*-sparc64       # LP64 problem
-
-GNU_CONFIGURE=         YES
-USE_TOOLS+=            gmake makeinfo
-INFO_FILES=            YES
-
-.include "../../mk/bsd.prefs.mk"
+NOT_FOR_PLATFORM=       *-*-alpha *-*-sparc64  # LP64 problem
 
-.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
+GNU_CONFIGURE=         yes
+USE_TOOLS+=            gmake makeinfo
+INFO_FILES=            yes
+
+.include "options.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r d788ee05d080 -r b5c13bab2be0 sysutils/mtools/PLIST
--- a/sysutils/mtools/PLIST     Thu Apr 10 20:56:33 2008 +0000
+++ b/sysutils/mtools/PLIST     Thu Apr 10 21:19:19 2008 +0000
@@ -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/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 -r d788ee05d080 -r b5c13bab2be0 sysutils/mtools/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/mtools/options.mk        Thu Apr 10 21:19:19 2008 +0000
@@ -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