[pkgsrc/trunk]: pkgsrc/wm/fvwm + Use the options framework instead of using F...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/62fa84d9b6d0
branches:  trunk
changeset: 540920:62fa84d9b6d0
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Apr 10 21:30:44 2008 +0000

description:
+ Use the options framework instead of using FVWM_USE_* variables.

+ Convert to use PLIST_VARS instead of manually passing "@comment "
  to the plist module.

Bump the PKGREVISION to 2 due to the options changes.

diffstat:

 wm/fvwm/Makefile   |  18 +++---------------
 wm/fvwm/options.mk |  21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 15 deletions(-)

diffs (59 lines):

diff -r b5c13bab2be0 -r 62fa84d9b6d0 wm/fvwm/Makefile
--- a/wm/fvwm/Makefile  Thu Apr 10 21:19:19 2008 +0000
+++ b/wm/fvwm/Makefile  Thu Apr 10 21:30:44 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2007/12/20 18:04:04 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2008/04/10 21:30:44 jlam Exp $
 
 DISTNAME=      fvwm-${FVWM_VER}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11 wm
 MASTER_SITES=  ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
                http://www.fvwm.org/generated/icon_download/
@@ -62,19 +62,7 @@
                        ${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc ; \
        fi
 
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(FVWM2_USE_GTK) && ${FVWM2_USE_GTK} == "YES"
-.include "../../x11/gtk/buildlink3.mk"
-PLIST_SUBST+=          GTK=""
-.else
-PLIST_SUBST+=          GTK="@comment "
-CONFIGURE_ARGS+=       --without-gtk-prefix
-.endif
-
-.if defined(FVWM2_USE_RPLAY) && ${FVWM2_USE_RPLAY} == "YES"
-.include "../../audio/rplay/buildlink3.mk"
-.endif
+.include "options.mk"
 
 BUILDLINK_DEPMETHOD.libXt?=    build
 
diff -r b5c13bab2be0 -r 62fa84d9b6d0 wm/fvwm/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/fvwm/options.mk        Thu Apr 10 21:30:44 2008 +0000
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2008/04/10 21:30:44 jlam Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.fvwm
+PKG_SUPPORTED_OPTIONS=         gtk rplay
+PKG_OPTIONS_LEGACY_VARS+=      FVWM2_USE_GTK:gtk
+PKG_OPTIONS_LEGACY_VARS+=      FVWM2_USE_RPLAY:rplay
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=           gtk
+
+.if !empty(PKG_OPTIONS:Mgtk)
+.  include "../../x11/gtk/buildlink3.mk"
+PLIST.gtk=             yes
+.else
+CONFIGURE_ARGS+=       --without-gtk-prefix
+.endif
+
+.if !empty(PKG_OPTIONS:Mrplay)
+.  include "../../audio/rplay/buildlink3.mk"
+.endif