Sat May 25 01:38:00 2013 UTC ()
Move flac, speex, and vorbis PKG_OPTIONS to PKG_OPTIONS_SET.codec, because
at least one of them is required, configure fails if one isn't set, and we
can help the user not make this mistake.


(rodent)
diff -r1.1 -r1.2 pkgsrc/audio/libfishsound/options.mk
cvs diff -r1.1 -r1.2 pkgsrc/audio/libfishsound/options.mk (expand / switch to unified diff)

--- pkgsrc/audio/libfishsound/options.mk 2013/05/09 00:42:45 1.1
+++ pkgsrc/audio/libfishsound/options.mk 2013/05/25 01:37:59 1.2
@@ -1,18 +1,21 @@ @@ -1,18 +1,21 @@
1# $NetBSD: options.mk,v 1.1 2013/05/09 00:42:45 rodent Exp $ 1# $NetBSD: options.mk,v 1.2 2013/05/25 01:37:59 rodent Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libfish 3PKG_OPTIONS_VAR= PKG_OPTIONS.libfishsound
4PKG_SUPPORTED_OPTIONS= doc flac speex valgrind vorbis 4PKG_SUPPORTED_OPTIONS= doc valgrind
5PKG_SUGGESTED_OPTIONS+= flac speex vorbis 5PKG_SUGGESTED_OPTIONS+= flac speex vorbis
 6PKG_OPTIONS_NONEMPTY_SETS+= codec
 7PKG_OPTIONS_SET.codec= flac speex vorbis
 8
6PLIST_VARS+= doc nodoc 9PLIST_VARS+= doc nodoc
7 10
8.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
9 12
10.if !empty(PKG_OPTIONS:Mdoc) 13.if !empty(PKG_OPTIONS:Mdoc)
11BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen 14BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
12PLIST.doc= yes 15PLIST.doc= yes
13.else 16.else
14CONFIGURE_ARGS+= HAVE_DOXYGEN=no 17CONFIGURE_ARGS+= HAVE_DOXYGEN=no
15PLIST.nodoc= yes 18PLIST.nodoc= yes
16.endif 19.endif
17 20
18.if !empty(PKG_OPTIONS:Mflac) 21.if !empty(PKG_OPTIONS:Mflac)