libmp3splt

- Update to 0.9.2
- Use INSTALL_TARGET as install-strip
while here
- Use options helpers
- Add a pkg-plist file

mp3splt
- Update to 2.6.2
while here
- Use options helpers
- Add a pkg-plist file

PR:		195923
Submitted by:	Anton Yuzhaninov <citrin+pr@citrin.ru> (maintainer)

7 files changed, 63 insertions, 91 deletions

diff --git a/audio/libmp3splt/Makefile b/audio/libmp3splt/Makefile
index 9681fe250518..0611f2bd0ab0 100644
--- a/audio/libmp3splt/Makefile
+++ b/audio/libmp3splt/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libmp3splt
-PORTVERSION=	0.8.2
-PORTREVISION=	3
+PORTVERSION=	0.9.2
 CATEGORIES=	audio
 MASTER_SITES=	SF/mp3splt/${PORTNAME}/${PORTVERSION}
 
@@ -18,70 +17,36 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-cutter --disable-doxygen_doc
 USES=		libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS_MULTI=	plugin
-OPTIONS_MULTI_plugin=	MAD VORBIS
+OPTIONS_MULTI_plugin=	MAD FLAC VORBIS
 OPTIONS_DEFINE=	ID3 PCRE NLS
+OPTIONS_SUB=	yes
 
 PCRE_DESC=	PCRE support to set tags from input filename
 
-OPTIONS_DEFAULT=	MAD VORBIS ID3 PCRE NLS
-
-PLUGIN_DIR=	libmp3splt0
-
-PLIST_DIRS=	include/libmp3splt lib/${PLUGIN_DIR}
-PLIST_FILES=	include/libmp3splt/mp3splt.h include/libmp3splt/version.h lib/libmp3splt.a \
-		lib/libmp3splt.so lib/libmp3splt.so.0 lib/libmp3splt.so.0.0.8 \
-		libdata/pkgconfig/libmp3splt.pc
+OPTIONS_DEFAULT=	MAD FLAC VORBIS ID3 PCRE NLS
 
-.include <bsd.port.options.mk>
+MAD_CONFIGURE_ENABLE=	mp3
+MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
 
-.if ${PORT_OPTIONS:MMAD}
-LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad
-PLIST_FILES+=	lib/${PLUGIN_DIR}/libsplt_mp3.a \
-		lib/${PLUGIN_DIR}/libsplt_mp3.so \
-		lib/${PLUGIN_DIR}/libsplt_mp3.so.0 \
-		lib/${PLUGIN_DIR}/libsplt_mp3.so.0.0.0
-.else
-CONFIGURE_ARGS+=	--disable-mp3
-.endif
+FLAC_CONFIGURE_ENABLE=	flac
+FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
 
-.if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	libogg.so:${PORTSDIR}/audio/libogg \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
-PLIST_FILES+=	lib/${PLUGIN_DIR}/libsplt_ogg.a \
-		lib/${PLUGIN_DIR}/libsplt_ogg.so \
-		lib/${PLUGIN_DIR}/libsplt_ogg.so.0 \
-		lib/${PLUGIN_DIR}/libsplt_ogg.so.0.0.0
-.else
-CONFIGURE_ARGS+=	--disable-ogg
-.endif
+VORBIS_CONFIGURE_ENABLE=ogg
+VORBIS_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
+			libvorbis.so:${PORTSDIR}/audio/libvorbis
 
-.if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
-.else
-CONFIGURE_ARGS+=	--disable-pcre
-.endif
+PCRE_CONFIGURE_ENABLE=	pcre
+PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
-.if ${PORT_OPTIONS:MID3}
-LIB_DEPENDS+=	libid3tag.so:${PORTSDIR}/audio/libid3tag
-.else
-CONFIGURE_ARGS+=	--disable-id3tag
-.endif
+MID3_LIB_DEPENDS=	libid3tag.so:${PORTSDIR}/audio/libid3tag
+MID3_CONFIGURE_ENABLE=	id3tag
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-LANGUAGES=	de_DE cs es fr_FR hr
-.for language in ${LANGUAGES}
-PLIST_FILES+=	share/locale/${language}/LC_MESSAGES/libmp3splt0.mo
-.endfor
-PLIST_FILES+=	"@dirrmtry share/locale/de_DE/LC_MESSAGES"
-PLIST_FILES+=	"@dirrmtry share/locale/de_DE"
-.else
-CONFIGURE_ARGS+=	--disable-nls
-.endif
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.mk>
diff --git a/audio/libmp3splt/distinfo b/audio/libmp3splt/distinfo
index 13984e2be291..ae3f75051963 100644
--- a/audio/libmp3splt/distinfo
+++ b/audio/libmp3splt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libmp3splt-0.8.2.tar.gz) = 7be4165da43b499a0a70084103ae5b0d9b3095c9d2fff1e673dcb10b9c232ade
-SIZE (libmp3splt-0.8.2.tar.gz) = 671071
+SHA256 (libmp3splt-0.9.2.tar.gz) = 30eed64fce58cb379b7cc6a0d8e545579cb99d0f0f31eb00b9acc8aaa1b035dc
+SIZE (libmp3splt-0.9.2.tar.gz) = 707598
diff --git a/audio/libmp3splt/files/patch-src-socket_manager.c b/audio/libmp3splt/files/patch-src-socket_manager.c
deleted file mode 100644
index 8fb505390abc..000000000000
--- a/audio/libmp3splt/files/patch-src-socket_manager.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/socket_manager.c.orig	2013-01-31 20:18:07.000000000 +0400
-+++ src/socket_manager.c	2013-01-31 20:20:31.000000000 +0400
-@@ -48,8 +48,6 @@
- 
- #ifdef __WIN32__
- #include <malloc.h>
--#else
--#include <alloca.h>
- #endif
- 
- #include <string.h>
diff --git a/audio/libmp3splt/pkg-plist b/audio/libmp3splt/pkg-plist
new file mode 100644
index 000000000000..afb4345a779a
--- /dev/null
+++ b/audio/libmp3splt/pkg-plist
@@ -0,0 +1,24 @@
+include/libmp3splt/mp3splt.h
+include/libmp3splt/version.h
+lib/libmp3splt.a
+lib/libmp3splt.so
+lib/libmp3splt.so.0
+lib/libmp3splt.so.0.0.9
+%%FLAC%%lib/libmp3splt0/libsplt_flac.a
+%%FLAC%%lib/libmp3splt0/libsplt_flac.so
+%%FLAC%%lib/libmp3splt0/libsplt_flac.so.0
+%%FLAC%%lib/libmp3splt0/libsplt_flac.so.0.0.0
+%%MAD%%lib/libmp3splt0/libsplt_mp3.a
+%%MAD%%lib/libmp3splt0/libsplt_mp3.so
+%%MAD%%lib/libmp3splt0/libsplt_mp3.so.0
+%%MAD%%lib/libmp3splt0/libsplt_mp3.so.0.0.0
+%%VORBIS%%lib/libmp3splt0/libsplt_ogg.a
+%%VORBIS%%lib/libmp3splt0/libsplt_ogg.so
+%%VORBIS%%lib/libmp3splt0/libsplt_ogg.so.0
+%%VORBIS%%lib/libmp3splt0/libsplt_ogg.so.0.0.0
+libdata/pkgconfig/libmp3splt.pc
+%%NLS%%share/locale/cs/LC_MESSAGES/libmp3splt0.mo
+%%NLS%%share/locale/de_DE/LC_MESSAGES/libmp3splt0.mo
+%%NLS%%share/locale/es/LC_MESSAGES/libmp3splt0.mo
+%%NLS%%share/locale/fr_FR/LC_MESSAGES/libmp3splt0.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/libmp3splt0.mo
diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile
index 3ece642f0ecd..99df50d42926 100644
--- a/audio/mp3splt/Makefile
+++ b/audio/mp3splt/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mp3splt
-PORTVERSION=	2.5.2
+PORTVERSION=	2.6.2
 CATEGORIES=	audio
 MASTER_SITES=	SF/mp3splt/${PORTNAME}/${PORTVERSION}
 
@@ -14,33 +14,19 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libmp3splt.so:${PORTSDIR}/audio/libmp3splt \
 		libltdl.so:${PORTSDIR}/devel/libltdl
 
-USES=		pkgconfig:build
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-oggsplt_symlink
 CONFIGURE_ENV+=	PKG_CONFIG_PATH=${LOCALBASE}/lib/pkgconfig
 
-CPPFLAGS+=	-I${LOCALBASE}/include
+CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-PLIST_FILES=	bin/mp3splt bin/oggsplt \
-		man/man1/mp3splt.1.gz \
-		man/man1/oggsplt.1.gz
-
-OPTIONS_DEFINE=	NLS
+OPTIONS_DEFINE=		NLS
 OPTIONS_DEFAULT=	NLS
+OPTIONS_SUB=		yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-LANGUAGES=	cs de_DE es fr_FR
-.for language in ${LANGUAGES}
-PLIST_FILES+=	share/locale/${language}/LC_MESSAGES/mp3splt.mo
-.endfor
-PLIST_DIRSTRY+=	share/locale/de_DE/LC_MESSAGES
-PLIST_DIRSTRY+=	share/locale/de_DE
-.else
-CONFIGURE_ARGS+=	--disable-nls
-.endif
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.mk>
diff --git a/audio/mp3splt/distinfo b/audio/mp3splt/distinfo
index 1b17ae6a34aa..086d7d1c5f07 100644
--- a/audio/mp3splt/distinfo
+++ b/audio/mp3splt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mp3splt-2.5.2.tar.gz) = df093e8950ba8f160898296f57e7c9134316b6e20d51b3e66d9c3b39f5fc2a44
-SIZE (mp3splt-2.5.2.tar.gz) = 250066
+SHA256 (mp3splt-2.6.2.tar.gz) = 3ec32b10ddd8bb11af987b8cd1c76382c48d265d0ffda53041d9aceb1f103baa
+SIZE (mp3splt-2.6.2.tar.gz) = 260901
diff --git a/audio/mp3splt/pkg-plist b/audio/mp3splt/pkg-plist
new file mode 100644
index 000000000000..9aa8e3a63426
--- /dev/null
+++ b/audio/mp3splt/pkg-plist
@@ -0,0 +1,8 @@
+bin/mp3splt
+bin/oggsplt
+man/man1/mp3splt.1.gz
+man/man1/oggsplt.1.gz
+%%NLS%%share/locale/cs/LC_MESSAGES/mp3splt.mo
+%%NLS%%share/locale/de_DE/LC_MESSAGES/mp3splt.mo
+%%NLS%%share/locale/es/LC_MESSAGES/mp3splt.mo
+%%NLS%%share/locale/fr_FR/LC_MESSAGES/mp3splt.mo