CVS commit: pkgsrc/audio/bmp

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Apr  5 08:49:33 UTC 2021

Modified Files:
        pkgsrc/audio/bmp: Makefile Makefile.common
Added Files:
        pkgsrc/audio/bmp: options.mk

Log Message:
bmp: Clean up options handling.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/audio/bmp/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/audio/bmp/Makefile.common
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/bmp/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/audio/bmp/Makefile
diff -u pkgsrc/audio/bmp/Makefile:1.80 pkgsrc/audio/bmp/Makefile:1.81
--- pkgsrc/audio/bmp/Makefile:1.80      Thu Nov  5 09:07:23 2020
+++ pkgsrc/audio/bmp/Makefile   Mon Apr  5 08:49:33 2021
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.80 2020/11/05 09:07:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.81 2021/04/05 08:49:33 nia Exp $
 #
 
-BMP_ENABLE_ENCODERS=   yes
-
 .include "Makefile.common"
 PKGREVISION=           53
 

Index: pkgsrc/audio/bmp/Makefile.common
diff -u pkgsrc/audio/bmp/Makefile.common:1.32 pkgsrc/audio/bmp/Makefile.common:1.33
--- pkgsrc/audio/bmp/Makefile.common:1.32       Sun Jan 26 05:26:09 2020
+++ pkgsrc/audio/bmp/Makefile.common    Mon Apr  5 08:49:33 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2020/01/26 05:26:09 rillig Exp $
+# $NetBSD: Makefile.common,v 1.33 2021/04/05 08:49:33 nia Exp $
 #
 # used by audio/bmp/Makefile
 
@@ -23,49 +23,17 @@ USE_LIBTOOL=                yes
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            pkg-config
 
-BMP_USE_ESD?=          no
-
 CONFIGURE_ARGS+=       --disable-alsa
-.if !empty(BMP_USE_ESD:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=       --enable-esd
-.else
 CONFIGURE_ARGS+=       --disable-esd
-.endif
 CONFIGURE_ARGS+=       --disable-opengl
-.if defined(BMP_ENABLE_ENCODERS) && !empty(BMP_ENABLE_ENCODERS:M[Yy][Ee][Ss])
 CONFIGURE_ARGS+=       --enable-mp3
 CONFIGURE_ARGS+=       --enable-ogg
 CONFIGURE_ARGS+=       --enable-vorbis
-.else
-CONFIGURE_ARGS+=       --disable-mp3
-CONFIGURE_ARGS+=       --disable-oss
-CONFIGURE_ARGS+=       --disable-vorbis
-.endif
 
 PKGCONFIG_OVERRIDE+=   bmp.pc
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.bmp
-PKG_SUPPORTED_OPTIONS= gnome inet6 xmms-eq
-PKG_SUGGESTED_OPTIONS= inet6
-
-.include "../../mk/bsd.options.mk"
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(PKG_OPTIONS:Mgnome)
-CONFIGURE_ARGS+=       --enable-gconf
-CONFIGURE_ARGS+=       --enable-gnome-vfs
-.  include "../../devel/GConf/buildlink3.mk"
-.  include "../../sysutils/gnome-vfs/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=       --enable-ipv6
-.endif
-
-.if !empty(PKG_OPTIONS:Mxmms-eq)
-CONFIGURE_ARGS+=       --with-xmms-eq
-.endif
-
 .if ${OPSYS} == "NetBSD"
 RAWPART_cmd=           /sbin/sysctl -n kern.rawpartition | ${TR} 0-9 a-j
 CONFIGURE_ARGS+=       --with-dev-dsp=${DEVOSSSOUND:Q}                 \
@@ -89,6 +57,7 @@ post-patch:
 
 BUILDLINK_DEPMETHOD.libXt?=    build
 
+.include "options.mk"
 .include "../../audio/libmikmod/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -97,5 +66,4 @@ BUILDLINK_DEPMETHOD.libXt?=   build
 .include "../../devel/pango/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-
 .include "../../mk/oss.buildlink3.mk"

Added files:

Index: pkgsrc/audio/bmp/options.mk
diff -u /dev/null pkgsrc/audio/bmp/options.mk:1.1
--- /dev/null   Mon Apr  5 08:49:33 2021
+++ pkgsrc/audio/bmp/options.mk Mon Apr  5 08:49:33 2021
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2021/04/05 08:49:33 nia Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.bmp
+PKG_SUPPORTED_OPTIONS= inet6 xmms-eq
+PKG_SUGGESTED_OPTIONS= inet6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=       --enable-ipv6
+.endif
+
+.if !empty(PKG_OPTIONS:Mxmms-eq)
+CONFIGURE_ARGS+=       --with-xmms-eq
+.endif
+