Import of pkgsrc-2014Q1

audio/libopus/Makefile

@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2012/12/11 10:26:56 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.5 2014/01/05 19:56:50 wiz Exp $
 
-DISTNAME=	opus-1.0.2
+DISTNAME=	opus-1.1
+PKGNAME=	lib${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/opus/
 
@@ -10,10 +11,15 @@ HOMEPAGE=	http://opus-codec.org/
 COMMENT=	Totally open, royalty-free, highly versatile audio codec library
 LICENSE=	modified-bsd
 
+CONFLICTS=	opus<=1.0.2
+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"

audio/libopus/PLIST

@@ -1,8 +1,135 @@
-@comment $NetBSD: PLIST,v 1.1 2012/09/16 14:17:20 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
+${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
+${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

audio/libopus/buildlink3.mk

@@ -1,13 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2012/12/11 10:29:00 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2014/01/02 14:43:21 ryoon Exp $
 
-BUILDLINK_TREE+=	opus
+BUILDLINK_TREE+=	libopus
 
-.if !defined(OPUS_BUILDLINK3_MK)
-OPUS_BUILDLINK3_MK:=
+.if !defined(LIBOPUS_BUILDLINK3_MK)
+LIBOPUS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.opus+=	opus>=1.0.1
-BUILDLINK_ABI_DEPENDS.opus+=	opus>=1.0.2
-BUILDLINK_PKGSRCDIR.opus?=	../../audio/libopus
-.endif	# OPUS_BUILDLINK3_MK
+BUILDLINK_API_DEPENDS.libopus+=	libopus>=1.1
+BUILDLINK_PKGSRCDIR.libopus?=	../../audio/libopus
+.endif	# LIBOPUS_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-opus
+BUILDLINK_TREE+=	-libopus

audio/libopus/distinfo

@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2012/12/11 10:26:56 ryoon Exp $
+$NetBSD: distinfo,v 1.3 2014/01/02 14:43:21 ryoon Exp $
 
-SHA1 (opus-1.0.2.tar.gz) = 37dd3d69b10612cd513ccf26675ef6d61eda24b4
-RMD160 (opus-1.0.2.tar.gz) = d1aa4c534cd7dc629e3ac155866bba810bb6ce42
-Size (opus-1.0.2.tar.gz) = 777306 bytes
+SHA1 (opus-1.1.tar.gz) = 35005f5549e2583f5770590135984dcfce6f3d58
+RMD160 (opus-1.1.tar.gz) = 01945dc82b7573f1d8b706bd82a4cb3fda57da35
+Size (opus-1.1.tar.gz) = 850208 bytes
+SHA1 (patch-configure) = 707ab1c9e5a9ad404b822fa7931d57a54568ead9

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

audio/libopus/patches/patch-configure

@@ -0,0 +1,36 @@
+$NetBSD: patch-configure,v 1.1 2014/01/02 14:43:21 ryoon Exp $
+
+* Fix "Syntax error: Bad substitution" error on NetBSD
+  From http://svnweb.freebsd.org/ports/head/audio/opus/files/patch-configure?revision=336843&view=co 
+--- configure.orig	2014-01-02 13:28:21.000000000 +0000
++++ configure
+@@ -12774,9 +12774,9 @@ fi
+ fi
+ 
+                                                 if test x"$rtcd_support" != x""; then :
+-  rtcd_support=ARM"$rtcd_support"
++  rtcd_support=ARM"$rtcd_support" ;
+ else
+-  rtcd_support="no"
++  rtcd_support="no" ;
+ 
+ fi
+ 
+@@ -12807,7 +12807,7 @@ else
+   CPU_ARM_FALSE=
+ fi
+ 
+- if test x"${inline_optimization:0:3}" = x"ARM"; then
++ if expr x"${inline_optimization}" : x"ARM" >/dev/null; then
+   OPUS_ARM_INLINE_ASM_TRUE=
+   OPUS_ARM_INLINE_ASM_FALSE='#'
+ else
+@@ -12815,7 +12815,7 @@ else
+   OPUS_ARM_INLINE_ASM_FALSE=
+ fi
+ 
+- if test x"${asm_optimization:0:3}" = x"ARM"; then
++ if expr x"${asm_optimization}" : x"ARM" >/dev/null; then
+   OPUS_ARM_EXTERNAL_ASM_TRUE=
+   OPUS_ARM_EXTERNAL_ASM_FALSE='#'
+ else