summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2020-02-26 18:09:40 +0000
committernia <nia@pkgsrc.org>2020-02-26 18:09:40 +0000
commitf736fdf9b6c5f2983bd22bb51583df3e9475e528 (patch)
treea06e113e62a177631ef2a91a4fee905c8a9e4d52 /wm
parent4346d9da305db105b49480196887565c93f5fa21 (diff)
downloadpkgsrc-f736fdf9b6c5f2983bd22bb51583df3e9475e528.tar.gz
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.
Diffstat (limited to 'wm')
-rw-r--r--wm/fvwm/Makefile3
-rw-r--r--wm/fvwm/options.mk11
2 files changed, 4 insertions, 10 deletions
diff --git a/wm/fvwm/Makefile b/wm/fvwm/Makefile
index 038bb85bfe1..b9520f4ba9a 100644
--- a/wm/fvwm/Makefile
+++ b/wm/fvwm/Makefile
@@ -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}/lib/X11/fvwm2
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}
diff --git a/wm/fvwm/options.mk b/wm/fvwm/options.mk
index d792b3082c4..d2160fad57c 100644
--- a/wm/fvwm/options.mk
+++ b/wm/fvwm/options.mk
@@ -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"