- Update libmp3splt to 0.8.2

- Update mp3splt to 2.5.2

- Add license
- Pet portlint

Submitted by:	maintainer via IRC

5 files changed, 19 insertions, 18 deletions

diff --git a/audio/libmp3splt/Makefile b/audio/libmp3splt/Makefile
index c8f6c00f9b30..3330c7021550 100644
--- a/audio/libmp3splt/Makefile
+++ b/audio/libmp3splt/Makefile
@@ -2,14 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	libmp3splt
-PORTVERSION=	0.8.1a
+PORTVERSION=	0.8.2
 CATEGORIES=	audio
 MASTER_SITES=	SF/mp3splt/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	citrin@citrin.ru
 COMMENT=	Library for splitting of various audio files
 
+LICENSE=	GPLv2
+
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-cutter --disable-doxygen_doc
+USES=	pathfix
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libltdl
 MAKE_JOBS_SAFE=	yes
@@ -25,9 +29,10 @@ OPTIONS_DEFAULT=	MAD VORBIS ID3 PCRE NLS
 PLUGIN_DIR=	libmp3splt0
 
 PLIST_DIRS=	include/libmp3splt lib/${PLUGIN_DIR}
-PLIST_FILES=	include/libmp3splt/mp3splt.h lib/libmp3splt.a \
+PLIST_DIRSTRY=	libdata/pkgconfig
+PLIST_FILES=	include/libmp3splt/mp3splt.h include/libmp3splt/version.h lib/libmp3splt.a \
 		lib/libmp3splt.la lib/libmp3splt.so lib/libmp3splt.so.0 \
-		share/aclocal/mp3splt.m4
+		libdata/pkgconfig/libmp3splt.pc
 
 .include <bsd.port.options.mk>
 
diff --git a/audio/libmp3splt/distinfo b/audio/libmp3splt/distinfo
index 1fdb3972e9ab..13984e2be291 100644
--- a/audio/libmp3splt/distinfo
+++ b/audio/libmp3splt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libmp3splt-0.8.1a.tar.gz) = a8010061050bae297a4d85bf9626fb8c0c4a9fec110f7eee4cf739d256c84034
-SIZE (libmp3splt-0.8.1a.tar.gz) = 635022
+SHA256 (libmp3splt-0.8.2.tar.gz) = 7be4165da43b499a0a70084103ae5b0d9b3095c9d2fff1e673dcb10b9c232ade
+SIZE (libmp3splt-0.8.2.tar.gz) = 671071
diff --git a/audio/libmp3splt/pkg-descr b/audio/libmp3splt/pkg-descr
index a53d1566f6ce..1d3f4a006300 100644
--- a/audio/libmp3splt/pkg-descr
+++ b/audio/libmp3splt/pkg-descr
@@ -9,4 +9,4 @@ few seconds. For mp3 files, both ID3v1 & ID3v2 tags are supported.
 
 Mp3splt-project is split in 3 parts : libmp3splt, mp3splt and mp3splt-gtk.
 
-WWW:	http://mp3splt.sourceforge.net/
+WWW: http://mp3splt.sourceforge.net/
diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile
index 3bd8e1854397..3a2057daf793 100644
--- a/audio/mp3splt/Makefile
+++ b/audio/mp3splt/Makefile
@@ -2,18 +2,22 @@
 # $FreeBSD$
 
 PORTNAME=	mp3splt
-PORTVERSION=	2.5.1
+PORTVERSION=	2.5.2
 CATEGORIES=	audio
 MASTER_SITES=	SF/mp3splt/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	citrin@citrin.ru
 COMMENT=	Utility to split MP3 and Ogg files (via CUE sheets)
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	mp3splt:${PORTSDIR}/audio/libmp3splt
 
+USES=	pkgconfig:build
 USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-oggsplt_symlink --disable-mp3splttest
+CONFIGURE_ARGS=	--enable-oggsplt_symlink
+CONFIGURE_ENV+=	PKG_CONFIG_PATH=${LOCALBASE}/lib/pkgconfig
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -38,12 +42,4 @@ PLIST_DIRSTRY+=	share/locale/de_DE
 CONFIGURE_ARGS+=	--disable-nls
 .endif
 
-post-patch:
-.if ${OSVERSION} < 800067
-# getline() is GNU extension which FreeBSD only recently adopted
-	@${REINPLACE_CMD} -E \
-		's:getline\(&(.+, )&(.+, .+\) == )-1:fgets(\1\2NULL:' \
-			${WRKSRC}/src/freedb.c
-.endif
-
 .include <bsd.port.mk>
diff --git a/audio/mp3splt/distinfo b/audio/mp3splt/distinfo
index e19c90c2253e..1b17ae6a34aa 100644
--- a/audio/mp3splt/distinfo
+++ b/audio/mp3splt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mp3splt-2.5.1.tar.gz) = 90f332987db5883c69a2ef533e2b1555058290036040a76d62345f53d4b4cd80
-SIZE (mp3splt-2.5.1.tar.gz) = 251278
+SHA256 (mp3splt-2.5.2.tar.gz) = df093e8950ba8f160898296f57e7c9134316b6e20d51b3e66d9c3b39f5fc2a44
+SIZE (mp3splt-2.5.2.tar.gz) = 250066