CVS commit: pkgsrc/wm/fvwm

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Feb 26 18:09:40 UTC 2020

Modified Files:
        pkgsrc/wm/fvwm: Makefile options.mk

Log Message:
fvwm: Remove rplay support, previously disabled by default

This is another dead sound server, the website for it disappeared in 2005
and this is the last (optional) user in pkgsrc.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/wm/fvwm/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/wm/fvwm/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/fvwm/Makefile
diff -u pkgsrc/wm/fvwm/Makefile:1.42 pkgsrc/wm/fvwm/Makefile:1.43
--- pkgsrc/wm/fvwm/Makefile:1.42        Sun Jan 19 22:16:18 2020
+++ pkgsrc/wm/fvwm/Makefile     Wed Feb 26 18:09:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2020/01/19 22:16:18 maya Exp $
+# $NetBSD: Makefile,v 1.43 2020/02/26 18:09:40 nia Exp $
 
 DISTNAME=      fvwm-${FVWM_VER}
 CATEGORIES=    x11 wm
@@ -26,6 +26,7 @@ CONFIGURE_ARGS+=      --sysconfdir=${PREFIX}/
 CONFIGURE_ARGS+=       --libexecdir=${PREFIX}/lib/X11
 CONFIGURE_ARGS+=       --with-xpm-includes=${BUILDLINK_PREFIX.libXpm}/include
 CONFIGURE_ARGS+=       --with-imagepath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11BASE}/include/X11/bitmaps:${X11BASE}/include/X11/pixmaps
+CONFIGURE_ARGS+=       --without-rplay-library
 
 # We don't want to have CPP from the buildlink directory
 CONFIGURE_ENV+=                ac_cv_path_FVWM_CPP=${CPP:Q}

Index: pkgsrc/wm/fvwm/options.mk
diff -u pkgsrc/wm/fvwm/options.mk:1.4 pkgsrc/wm/fvwm/options.mk:1.5
--- pkgsrc/wm/fvwm/options.mk:1.4       Sun Jan 19 22:16:18 2020
+++ pkgsrc/wm/fvwm/options.mk   Wed Feb 26 18:09:40 2020
@@ -1,10 +1,9 @@
-# $NetBSD: options.mk,v 1.4 2020/01/19 22:16:18 maya Exp $
+# $NetBSD: options.mk,v 1.5 2020/02/26 18:09:40 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.fvwm
-PKG_SUPPORTED_OPTIONS=         gtk rplay xrender xcursor xft2 fribidi debug svg
+PKG_SUPPORTED_OPTIONS=         gtk xrender xcursor xft2 fribidi debug svg
 PKG_SUGGESTED_OPTIONS+=                svg
 PKG_OPTIONS_LEGACY_VARS+=      FVWM2_USE_GTK:gtk
-PKG_OPTIONS_LEGACY_VARS+=      FVWM2_USE_RPLAY:rplay
 
 .include "../../mk/bsd.options.mk"
 
@@ -17,12 +16,6 @@ PLIST.gtk=           yes
 CONFIGURE_ARGS+=       --without-gtk-prefix
 .endif
 
-.if !empty(PKG_OPTIONS:Mrplay)
-.  include "../../audio/rplay/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --without-rplay-library
-.endif
-
 .if !empty(PKG_OPTIONS:Mxcursor)
 CONFIGURE_ARGS+=       --enable-xcursor
 .include "../../x11/libXcursor/buildlink3.mk"