diff options
| author | jlam <jlam@pkgsrc.org> | 2008-04-10 21:30:44 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-04-10 21:30:44 +0000 |
| commit | b5a8d62c8c2873210e45adde9ae3eace67ad3ff5 (patch) | |
| tree | 09e0c331a9b9a1f5999279c3b2ff5acad4dd1b89 /wm | |
| parent | 2ef6f9a883a9c2fa44045b5fdfa13dfe143ced4e (diff) | |
| download | pkgsrc-b5a8d62c8c2873210e45adde9ae3eace67ad3ff5.tar.gz | |
+ 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 (limited to 'wm')
| -rw-r--r-- | wm/fvwm/Makefile | 18 | ||||
| -rw-r--r-- | wm/fvwm/options.mk | 21 |
2 files changed, 24 insertions, 15 deletions
diff --git a/wm/fvwm/Makefile b/wm/fvwm/Makefile index 8817c6d3417..ddc854607c6 100644 --- a/wm/fvwm/Makefile +++ b/wm/fvwm/Makefile @@ -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 @@ post-install: ${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 --git a/wm/fvwm/options.mk b/wm/fvwm/options.mk new file mode 100644 index 00000000000..2cdef51a61f --- /dev/null +++ b/wm/fvwm/options.mk @@ -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 |