Change distfile and distsite to SourceForge (project opencore-amr)

Update WWW link in pkg-descr

6 files changed, 14 insertions, 34 deletions

diff --git a/audio/vo-aacenc/Makefile b/audio/vo-aacenc/Makefile
index e180f4512d90..8f4bbd00f9cc 100644
--- a/audio/vo-aacenc/Makefile
+++ b/audio/vo-aacenc/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	vo-aacenc
 PORTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	https://github.com/mstorsjo/${PORTNAME}/tarball/v${PORTVERSION}/
-DISTNAME=	mstorsjo-${PORTNAME}-v${PORTVERSION}-0-g${GITVERSION}
+MASTER_SITES=	SF/opencore-amr/${PORTNAME}
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	VisualOn AAC encoder library
@@ -17,21 +17,11 @@ COMMENT=	VisualOn AAC encoder library
 LICENSE=	ASL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-GITVERSION=	4646ab8
-FETCH_ARGS=	-pRr
-WRKSRC=		${WRKDIR}/mstorsjo-${PORTNAME}-${GITVERSION}
-
 GNU_CONFIGURE=	yes
 
-USE_AUTOTOOLS=	libtoolize aclocal autoheader autoconf automake
-ACLOCAL_ARGS=	-I m4
-AUTOCONF_ARGS=	-I m4
-
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -E -e \
 	's|^pkgconfigdir = .*|pkgconfigdir = $$(prefix)/libdata/pkgconfig|g' \
-	${WRKSRC}/Makefile.am
+	${WRKSRC}/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/vo-aacenc/distinfo b/audio/vo-aacenc/distinfo
index b2bb30f227a2..3dfb35efae96 100644
--- a/audio/vo-aacenc/distinfo
+++ b/audio/vo-aacenc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mstorsjo-vo-aacenc-v0.1.1-0-g4646ab8.tar.gz) = 5ac421179c6cce74e8ac3f17f5f1ba009ed1df19d8d98d7b4ff8582af79bb813
-SIZE (mstorsjo-vo-aacenc-v0.1.1-0-g4646ab8.tar.gz) = 472343
+SHA256 (vo-aacenc-0.1.1.tar.gz) = 402bf88febb828e772ccf5015adbafcd36a924e1da15ab836fc35972654d6784
+SIZE (vo-aacenc-0.1.1.tar.gz) = 580504
diff --git a/audio/vo-aacenc/pkg-descr b/audio/vo-aacenc/pkg-descr
index 8b597d464934..c198655b52c1 100644
--- a/audio/vo-aacenc/pkg-descr
+++ b/audio/vo-aacenc/pkg-descr
@@ -5,4 +5,4 @@ Coding (AAC) audio codec. The library is based on a codec implementation
 by VisualOn as part of the Stagefright framework from the Google
 Android project.
 
-WWW: https://github.com/mstorsjo/vo-aacenc
+WWW: http://sourceforge.net/projects/opencore-amr
diff --git a/audio/vo-amrwbenc/Makefile b/audio/vo-amrwbenc/Makefile
index 7da2338ee70e..186b45f4d941 100644
--- a/audio/vo-amrwbenc/Makefile
+++ b/audio/vo-amrwbenc/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	vo-amrwbenc
 PORTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	https://github.com/mstorsjo/${PORTNAME}/tarball/v${PORTVERSION}/
-DISTNAME=	mstorsjo-${PORTNAME}-v${PORTVERSION}-0-g${GITVERSION}
+MASTER_SITES=	SF/opencore-amr/${PORTNAME}
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	VisualOn AMR-WB encoder library
@@ -17,21 +17,11 @@ COMMENT=	VisualOn AMR-WB encoder library
 LICENSE=	ASL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-GITVERSION=	b20d264
-FETCH_ARGS=	-pRr
-WRKSRC=		${WRKDIR}/mstorsjo-${PORTNAME}-${GITVERSION}
-
 GNU_CONFIGURE=	yes
 
-USE_AUTOTOOLS=	libtoolize aclocal autoheader autoconf automake
-ACLOCAL_ARGS=	-I m4
-AUTOCONF_ARGS=	-I m4
-
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -E -e \
 	's|^pkgconfigdir = .*|pkgconfigdir = $$(prefix)/libdata/pkgconfig|g' \
-	${WRKSRC}/Makefile.am
+	${WRKSRC}/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/vo-amrwbenc/distinfo b/audio/vo-amrwbenc/distinfo
index 60d19ed92692..704d1d1fa045 100644
--- a/audio/vo-amrwbenc/distinfo
+++ b/audio/vo-amrwbenc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mstorsjo-vo-amrwbenc-v0.1.1-0-gb20d264.tar.gz) = 674fae9dddc52abffc4e441f15ad3a388f993331e97a70a31e01e213018b236e
-SIZE (mstorsjo-vo-amrwbenc-v0.1.1-0-gb20d264.tar.gz) = 473426
+SHA256 (vo-amrwbenc-0.1.1.tar.gz) = ae6fd425ab76b2755801d9aafccb0e60faf4e1897fb1df260d6c8661d3f53719
+SIZE (vo-amrwbenc-0.1.1.tar.gz) = 581633
diff --git a/audio/vo-amrwbenc/pkg-descr b/audio/vo-amrwbenc/pkg-descr
index 4b2326d6085d..ae4440312754 100644
--- a/audio/vo-amrwbenc/pkg-descr
+++ b/audio/vo-amrwbenc/pkg-descr
@@ -5,4 +5,4 @@ Rate Wideband (AMR-WB) audio codec. The library is based on a codec
 implementation by VisualOn as part of the Stagefright framework from
 the Google Android project.
 
-WWW: https://github.com/mstorsjo/vo-amrwbenc
+WWW: http://sourceforge.net/projects/opencore-amr