svn commit: r383610 - in branches/2015Q2/audio/bcg729: . files

[Antoine Brodin]

Author: antoine
Date: Wed Apr  8 22:01:21 2015
New Revision: 383610
URL: https://svnweb.freebsd.org/changeset/ports/383610

Log:
  MFH: r383393
  
  - Update distinfo and unbreak
  - Take maintainership
  
  Distfiles differ mainly in the configure and build infrastructure,
  apart from fixing a pair of minor bugs.

Added:
  branches/2015Q2/audio/bcg729/files/patch-Makefile.am
     - copied unchanged from r383393, head/audio/bcg729/files/patch-Makefile.am
  branches/2015Q2/audio/bcg729/files/patch-include_bcg729_Makefile.am
     - copied unchanged from r383393, head/audio/bcg729/files/patch-include_bcg729_Makefile.am
  branches/2015Q2/audio/bcg729/files/patch-src_Makefile.am
     - copied unchanged from r383393, head/audio/bcg729/files/patch-src_Makefile.am
Deleted:
  branches/2015Q2/audio/bcg729/files/patch-include_basicOperationsMacros.h
Modified:
  branches/2015Q2/audio/bcg729/Makefile
  branches/2015Q2/audio/bcg729/distinfo
Directory Properties:
  branches/2015Q2/   (props changed)

Modified: branches/2015Q2/audio/bcg729/Makefile
==============================================================================
--- branches/2015Q2/audio/bcg729/Makefile	Wed Apr  8 21:51:42 2015	(r383609)
+++ branches/2015Q2/audio/bcg729/Makefile	Wed Apr  8 22:01:21 2015	(r383610)
@@ -3,11 +3,11 @@
 
 PORTNAME=	bcg729
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	SAVANNAH/linphone/plugins/sources
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	madpilot at FreeBSD.org
 COMMENT=	Software G729A encoder and decoder library written in C
 
 LICENSE=	GPLv2
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-strict
 INSTALL_TARGET=	install-strip
-USES=		libtool pathfix pkgconfig
+USES=		autoreconf libtool pkgconfig
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	MEDIASTREAMER
@@ -25,17 +25,8 @@ OPTIONS_DEFAULT=	MEDIASTREAMER
 MEDIASTREAMER_DESC=	Mediastreamer(linphone) support
 
 OPTIONS_SUB=	yes
+MEDIASTREAMER_CONFIGURE_ENABLE=	msplugin
 MEDIASTREAMER_LIB_DEPENDS=	libortp.so:${PORTSDIR}/net/ortp \
 				libmediastreamer_base.so:${PORTSDIR}/net/mediastreamer
 
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MMEDIASTREAMER}
-# If the option is disabled, force it to not build mediastreamer interface even if
-# configure found the needed dependencies
-pre-configure:
-	@${REINPLACE_CMD} -e '/^@BUILD_MSBCG729_TRUE@/d' \
-		${WRKSRC}/Makefile.in
-.endif
-
 .include <bsd.port.mk>

Modified: branches/2015Q2/audio/bcg729/distinfo
==============================================================================
--- branches/2015Q2/audio/bcg729/distinfo	Wed Apr  8 21:51:42 2015	(r383609)
+++ branches/2015Q2/audio/bcg729/distinfo	Wed Apr  8 22:01:21 2015	(r383610)
@@ -1,2 +1,2 @@
-SHA256 (bcg729-1.0.0.tar.gz) = 6f80f9820f081fbd8b3f97b7bdc9c584bd54ba4558fa714130f8a53b154509ac
-SIZE (bcg729-1.0.0.tar.gz) = 416311
+SHA256 (bcg729-1.0.0.tar.gz) = f7d2ff2789c132f43ac2223e418023f512474c819ef96a24fee5b75edab840cc
+SIZE (bcg729-1.0.0.tar.gz) = 446709

Copied: branches/2015Q2/audio/bcg729/files/patch-Makefile.am (from r383393, head/audio/bcg729/files/patch-Makefile.am)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q2/audio/bcg729/files/patch-Makefile.am	Wed Apr  8 22:01:21 2015	(r383610, copy of r383393, head/audio/bcg729/files/patch-Makefile.am)
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2015-02-25 20:45:18 UTC
++++ Makefile.am
+@@ -10,7 +10,7 @@ endif
+ if RUN_TESTS
+ SUBDIRS += test 
+ endif
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libbcg729.pc
+ 
+ rpm:

Copied: branches/2015Q2/audio/bcg729/files/patch-include_bcg729_Makefile.am (from r383393, head/audio/bcg729/files/patch-include_bcg729_Makefile.am)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q2/audio/bcg729/files/patch-include_bcg729_Makefile.am	Wed Apr  8 22:01:21 2015	(r383610, copy of r383393, head/audio/bcg729/files/patch-include_bcg729_Makefile.am)
@@ -0,0 +1,13 @@
+--- include/bcg729/Makefile.am.orig	2015-03-12 20:39:23 UTC
++++ include/bcg729/Makefile.am
+@@ -2,9 +2,6 @@ bcg729_includedir=$(includedir)/bcg729
+ 
+ public_headers=encoder.h decoder.h
+ 
+-bcg729_include_HEADERS=
+-if !BUILD_MSBCG729
+-bcg729_include_HEADERS+=$(public_headers)
+-endif
++bcg729_include_HEADERS=$(public_headers)
+ 
+ EXTRA_DIST=$(public_headers)

Copied: branches/2015Q2/audio/bcg729/files/patch-src_Makefile.am (from r383393, head/audio/bcg729/files/patch-src_Makefile.am)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q2/audio/bcg729/files/patch-src_Makefile.am	Wed Apr  8 22:01:21 2015	(r383610, copy of r383393, head/audio/bcg729/files/patch-src_Makefile.am)
@@ -0,0 +1,11 @@
+--- src/Makefile.am.orig	2015-03-12 20:39:18 UTC
++++ src/Makefile.am
+@@ -1,8 +1,4 @@
+-if BUILD_MSBCG729
+-noinst_LTLIBRARIES = libbcg729.la
+-else
+ lib_LTLIBRARIES = libbcg729.la
+-endif
+ 
+ libbcg729_la_SOURCES=	LP2LSPConversion.c \
+ 			LPSynthesisFilter.c \