Add gmake build dependency.

Add doc option to enable building documentation, defaulting to off.
Bump PKGREVISION, even though package didn't package before except if
you had doxygen installed.

3 files changed, 148 insertions, 131 deletions

diff --git a/audio/libopus/Makefile b/audio/libopus/Makefile
index 7940cc87045..645c59acc50 100644
--- a/audio/libopus/Makefile
+++ b/audio/libopus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2014/01/02 14:43:21 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.5 2014/01/05 19:56:50 wiz Exp $
 
 DISTNAME=	opus-1.1
 PKGNAME=	lib${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/opus/
 
@@ -16,8 +16,10 @@ SUPERSEDES=	opus<=1.0.2
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	gmake pkg-config
 
 PKGCONFIG_OVERRIDE+=	opus.pc.in
 
+.include "options.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libopus/PLIST b/audio/libopus/PLIST
index 1bfd48920c2..238459423cc 100644
--- a/audio/libopus/PLIST
+++ b/audio/libopus/PLIST
@@ -1,135 +1,135 @@
-@comment $NetBSD: PLIST,v 1.2 2014/01/02 14:43:21 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/01/05 19:56:50 wiz Exp $
 include/opus/opus.h
 include/opus/opus_defines.h
 include/opus/opus_multistream.h
 include/opus/opus_types.h
 lib/libopus.la
 lib/pkgconfig/opus.pc
-man/man3/opus_ctlvalues.3
-man/man3/opus_custom.3
-man/man3/opus_custom.h.3
-man/man3/opus_decoder.3
-man/man3/opus_decoderctls.3
-man/man3/opus_defines.h.3
-man/man3/opus_encoder.3
-man/man3/opus_encoderctls.3
-man/man3/opus_errorcodes.3
-man/man3/opus_genericctls.3
-man/man3/opus_libinfo.3
-man/man3/opus_multistream.3
-man/man3/opus_multistream.h.3
-man/man3/opus_multistream_ctls.3
-man/man3/opus_repacketizer.3
-man/man3/opus_types.h.3
+${PLIST.doc}man/man3/opus_ctlvalues.3
+${PLIST.doc}man/man3/opus_custom.3
+${PLIST.doc}man/man3/opus_custom.h.3
+${PLIST.doc}man/man3/opus_decoder.3
+${PLIST.doc}man/man3/opus_decoderctls.3
+${PLIST.doc}man/man3/opus_defines.h.3
+${PLIST.doc}man/man3/opus_encoder.3
+${PLIST.doc}man/man3/opus_encoderctls.3
+${PLIST.doc}man/man3/opus_errorcodes.3
+${PLIST.doc}man/man3/opus_genericctls.3
+${PLIST.doc}man/man3/opus_libinfo.3
+${PLIST.doc}man/man3/opus_multistream.3
+${PLIST.doc}man/man3/opus_multistream.h.3
+${PLIST.doc}man/man3/opus_multistream_ctls.3
+${PLIST.doc}man/man3/opus_repacketizer.3
+${PLIST.doc}man/man3/opus_types.h.3
 share/aclocal/opus.m4
-share/doc/opus/html/bc_s.png
-share/doc/opus/html/bdwn.png
-share/doc/opus/html/closed.png
-share/doc/opus/html/customdoxygen.css
-share/doc/opus/html/dir_000000.html
-share/doc/opus/html/doxygen.png
-share/doc/opus/html/dynsections.js
-share/doc/opus/html/files.html
-share/doc/opus/html/ftv2blank.png
-share/doc/opus/html/ftv2cl.png
-share/doc/opus/html/ftv2doc.png
-share/doc/opus/html/ftv2folderclosed.png
-share/doc/opus/html/ftv2folderopen.png
-share/doc/opus/html/ftv2lastnode.png
-share/doc/opus/html/ftv2link.png
-share/doc/opus/html/ftv2mlastnode.png
-share/doc/opus/html/ftv2mnode.png
-share/doc/opus/html/ftv2mo.png
-share/doc/opus/html/ftv2node.png
-share/doc/opus/html/ftv2ns.png
-share/doc/opus/html/ftv2plastnode.png
-share/doc/opus/html/ftv2pnode.png
-share/doc/opus/html/ftv2splitbar.png
-share/doc/opus/html/ftv2vertline.png
-share/doc/opus/html/globals.html
-share/doc/opus/html/globals_defs.html
-share/doc/opus/html/globals_func.html
-share/doc/opus/html/globals_type.html
-share/doc/opus/html/group__opus__ctlvalues.html
-share/doc/opus/html/group__opus__custom.html
-share/doc/opus/html/group__opus__decoder.html
-share/doc/opus/html/group__opus__decoderctls.html
-share/doc/opus/html/group__opus__encoder.html
-share/doc/opus/html/group__opus__encoderctls.html
-share/doc/opus/html/group__opus__errorcodes.html
-share/doc/opus/html/group__opus__genericctls.html
-share/doc/opus/html/group__opus__libinfo.html
-share/doc/opus/html/group__opus__multistream.html
-share/doc/opus/html/group__opus__multistream__ctls.html
-share/doc/opus/html/group__opus__repacketizer.html
-share/doc/opus/html/index.html
-share/doc/opus/html/jquery.js
-share/doc/opus/html/modules.html
-share/doc/opus/html/nav_f.png
-share/doc/opus/html/nav_g.png
-share/doc/opus/html/nav_h.png
-share/doc/opus/html/open.png
-share/doc/opus/html/opus_8h.html
-share/doc/opus/html/opus_8h_source.html
-share/doc/opus/html/opus__custom_8h.html
-share/doc/opus/html/opus__custom_8h_source.html
-share/doc/opus/html/opus__defines_8h.html
-share/doc/opus/html/opus__defines_8h_source.html
-share/doc/opus/html/opus__multistream_8h.html
-share/doc/opus/html/opus__multistream_8h_source.html
-share/doc/opus/html/opus__types_8h.html
-share/doc/opus/html/opus__types_8h_source.html
-share/doc/opus/html/opus_logo.svg
-share/doc/opus/html/search/all_64.html
-share/doc/opus/html/search/all_64.js
-share/doc/opus/html/search/all_65.html
-share/doc/opus/html/search/all_65.js
-share/doc/opus/html/search/all_67.html
-share/doc/opus/html/search/all_67.js
-share/doc/opus/html/search/all_6d.html
-share/doc/opus/html/search/all_6d.js
-share/doc/opus/html/search/all_6f.html
-share/doc/opus/html/search/all_6f.js
-share/doc/opus/html/search/all_70.html
-share/doc/opus/html/search/all_70.js
-share/doc/opus/html/search/all_72.html
-share/doc/opus/html/search/all_72.js
-share/doc/opus/html/search/close.png
-share/doc/opus/html/search/defines_6f.html
-share/doc/opus/html/search/defines_6f.js
-share/doc/opus/html/search/files_6f.html
-share/doc/opus/html/search/files_6f.js
-share/doc/opus/html/search/functions_6f.html
-share/doc/opus/html/search/functions_6f.js
-share/doc/opus/html/search/groups_64.html
-share/doc/opus/html/search/groups_64.js
-share/doc/opus/html/search/groups_65.html
-share/doc/opus/html/search/groups_65.js
-share/doc/opus/html/search/groups_67.html
-share/doc/opus/html/search/groups_67.js
-share/doc/opus/html/search/groups_6d.html
-share/doc/opus/html/search/groups_6d.js
-share/doc/opus/html/search/groups_6f.html
-share/doc/opus/html/search/groups_6f.js
-share/doc/opus/html/search/groups_70.html
-share/doc/opus/html/search/groups_70.js
-share/doc/opus/html/search/groups_72.html
-share/doc/opus/html/search/groups_72.js
-share/doc/opus/html/search/mag_sel.png
-share/doc/opus/html/search/nomatches.html
-share/doc/opus/html/search/pages_6f.html
-share/doc/opus/html/search/pages_6f.js
-share/doc/opus/html/search/search.css
-share/doc/opus/html/search/search.js
-share/doc/opus/html/search/search_l.png
-share/doc/opus/html/search/search_m.png
-share/doc/opus/html/search/search_r.png
-share/doc/opus/html/search/typedefs_6f.html
-share/doc/opus/html/search/typedefs_6f.js
-share/doc/opus/html/sync_off.png
-share/doc/opus/html/sync_on.png
-share/doc/opus/html/tab_a.png
-share/doc/opus/html/tab_b.png
-share/doc/opus/html/tab_h.png
-share/doc/opus/html/tab_s.png
-share/doc/opus/html/tabs.css
+${PLIST.doc}share/doc/opus/html/bc_s.png
+${PLIST.doc}share/doc/opus/html/bdwn.png
+${PLIST.doc}share/doc/opus/html/closed.png
+${PLIST.doc}share/doc/opus/html/customdoxygen.css
+${PLIST.doc}share/doc/opus/html/dir_000000.html
+${PLIST.doc}share/doc/opus/html/doxygen.png
+${PLIST.doc}share/doc/opus/html/dynsections.js
+${PLIST.doc}share/doc/opus/html/files.html
+${PLIST.doc}share/doc/opus/html/ftv2blank.png
+${PLIST.doc}share/doc/opus/html/ftv2cl.png
+${PLIST.doc}share/doc/opus/html/ftv2doc.png
+${PLIST.doc}share/doc/opus/html/ftv2folderclosed.png
+${PLIST.doc}share/doc/opus/html/ftv2folderopen.png
+${PLIST.doc}share/doc/opus/html/ftv2lastnode.png
+${PLIST.doc}share/doc/opus/html/ftv2link.png
+${PLIST.doc}share/doc/opus/html/ftv2mlastnode.png
+${PLIST.doc}share/doc/opus/html/ftv2mnode.png
+${PLIST.doc}share/doc/opus/html/ftv2mo.png
+${PLIST.doc}share/doc/opus/html/ftv2node.png
+${PLIST.doc}share/doc/opus/html/ftv2ns.png
+${PLIST.doc}share/doc/opus/html/ftv2plastnode.png
+${PLIST.doc}share/doc/opus/html/ftv2pnode.png
+${PLIST.doc}share/doc/opus/html/ftv2splitbar.png
+${PLIST.doc}share/doc/opus/html/ftv2vertline.png
+${PLIST.doc}share/doc/opus/html/globals.html
+${PLIST.doc}share/doc/opus/html/globals_defs.html
+${PLIST.doc}share/doc/opus/html/globals_func.html
+${PLIST.doc}share/doc/opus/html/globals_type.html
+${PLIST.doc}share/doc/opus/html/group__opus__ctlvalues.html
+${PLIST.doc}share/doc/opus/html/group__opus__custom.html
+${PLIST.doc}share/doc/opus/html/group__opus__decoder.html
+${PLIST.doc}share/doc/opus/html/group__opus__decoderctls.html
+${PLIST.doc}share/doc/opus/html/group__opus__encoder.html
+${PLIST.doc}share/doc/opus/html/group__opus__encoderctls.html
+${PLIST.doc}share/doc/opus/html/group__opus__errorcodes.html
+${PLIST.doc}share/doc/opus/html/group__opus__genericctls.html
+${PLIST.doc}share/doc/opus/html/group__opus__libinfo.html
+${PLIST.doc}share/doc/opus/html/group__opus__multistream.html
+${PLIST.doc}share/doc/opus/html/group__opus__multistream__ctls.html
+${PLIST.doc}share/doc/opus/html/group__opus__repacketizer.html
+${PLIST.doc}share/doc/opus/html/index.html
+${PLIST.doc}share/doc/opus/html/jquery.js
+${PLIST.doc}share/doc/opus/html/modules.html
+${PLIST.doc}share/doc/opus/html/nav_f.png
+${PLIST.doc}share/doc/opus/html/nav_g.png
+${PLIST.doc}share/doc/opus/html/nav_h.png
+${PLIST.doc}share/doc/opus/html/open.png
+${PLIST.doc}share/doc/opus/html/opus_8h.html
+${PLIST.doc}share/doc/opus/html/opus_8h_source.html
+${PLIST.doc}share/doc/opus/html/opus__custom_8h.html
+${PLIST.doc}share/doc/opus/html/opus__custom_8h_source.html
+${PLIST.doc}share/doc/opus/html/opus__defines_8h.html
+${PLIST.doc}share/doc/opus/html/opus__defines_8h_source.html
+${PLIST.doc}share/doc/opus/html/opus__multistream_8h.html
+${PLIST.doc}share/doc/opus/html/opus__multistream_8h_source.html
+${PLIST.doc}share/doc/opus/html/opus__types_8h.html
+${PLIST.doc}share/doc/opus/html/opus__types_8h_source.html
+${PLIST.doc}share/doc/opus/html/opus_logo.svg
+${PLIST.doc}share/doc/opus/html/search/all_0.html
+${PLIST.doc}share/doc/opus/html/search/all_0.js
+${PLIST.doc}share/doc/opus/html/search/all_1.html
+${PLIST.doc}share/doc/opus/html/search/all_1.js
+${PLIST.doc}share/doc/opus/html/search/all_2.html
+${PLIST.doc}share/doc/opus/html/search/all_2.js
+${PLIST.doc}share/doc/opus/html/search/all_3.html
+${PLIST.doc}share/doc/opus/html/search/all_3.js
+${PLIST.doc}share/doc/opus/html/search/all_4.html
+${PLIST.doc}share/doc/opus/html/search/all_4.js
+${PLIST.doc}share/doc/opus/html/search/all_5.html
+${PLIST.doc}share/doc/opus/html/search/all_5.js
+${PLIST.doc}share/doc/opus/html/search/all_6.html
+${PLIST.doc}share/doc/opus/html/search/all_6.js
+${PLIST.doc}share/doc/opus/html/search/close.png
+${PLIST.doc}share/doc/opus/html/search/defines_0.html
+${PLIST.doc}share/doc/opus/html/search/defines_0.js
+${PLIST.doc}share/doc/opus/html/search/files_0.html
+${PLIST.doc}share/doc/opus/html/search/files_0.js
+${PLIST.doc}share/doc/opus/html/search/functions_0.html
+${PLIST.doc}share/doc/opus/html/search/functions_0.js
+${PLIST.doc}share/doc/opus/html/search/groups_0.html
+${PLIST.doc}share/doc/opus/html/search/groups_0.js
+${PLIST.doc}share/doc/opus/html/search/groups_1.html
+${PLIST.doc}share/doc/opus/html/search/groups_1.js
+${PLIST.doc}share/doc/opus/html/search/groups_2.html
+${PLIST.doc}share/doc/opus/html/search/groups_2.js
+${PLIST.doc}share/doc/opus/html/search/groups_3.html
+${PLIST.doc}share/doc/opus/html/search/groups_3.js
+${PLIST.doc}share/doc/opus/html/search/groups_4.html
+${PLIST.doc}share/doc/opus/html/search/groups_4.js
+${PLIST.doc}share/doc/opus/html/search/groups_5.html
+${PLIST.doc}share/doc/opus/html/search/groups_5.js
+${PLIST.doc}share/doc/opus/html/search/groups_6.html
+${PLIST.doc}share/doc/opus/html/search/groups_6.js
+${PLIST.doc}share/doc/opus/html/search/mag_sel.png
+${PLIST.doc}share/doc/opus/html/search/nomatches.html
+${PLIST.doc}share/doc/opus/html/search/pages_0.html
+${PLIST.doc}share/doc/opus/html/search/pages_0.js
+${PLIST.doc}share/doc/opus/html/search/search.css
+${PLIST.doc}share/doc/opus/html/search/search.js
+${PLIST.doc}share/doc/opus/html/search/search_l.png
+${PLIST.doc}share/doc/opus/html/search/search_m.png
+${PLIST.doc}share/doc/opus/html/search/search_r.png
+${PLIST.doc}share/doc/opus/html/search/typedefs_0.html
+${PLIST.doc}share/doc/opus/html/search/typedefs_0.js
+${PLIST.doc}share/doc/opus/html/sync_off.png
+${PLIST.doc}share/doc/opus/html/sync_on.png
+${PLIST.doc}share/doc/opus/html/tab_a.png
+${PLIST.doc}share/doc/opus/html/tab_b.png
+${PLIST.doc}share/doc/opus/html/tab_h.png
+${PLIST.doc}share/doc/opus/html/tab_s.png
+${PLIST.doc}share/doc/opus/html/tabs.css
diff --git a/audio/libopus/options.mk b/audio/libopus/options.mk
new file mode 100644
index 00000000000..5e87417b504
--- /dev/null
+++ b/audio/libopus/options.mk
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2014/01/05 19:56:50 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.opus
+PKG_SUPPORTED_OPTIONS=	doc
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=	doc
+
+.if !empty(PKG_OPTIONS:Mdoc)
+BUILD_DEPENDS+=		doxygen-[0-9]*:../../devel/doxygen
+PLIST.doc=		yes
+.else
+CONFIGURE_ARGS+=	--disable-doc
+.endif