Update to verison 2.6.01.

PR:		81051
Submitted by:	Ports Fury

6 files changed, 79 insertions, 7 deletions

diff --git a/audio/mp3stat/Makefile b/audio/mp3stat/Makefile
index 6321372bac35..ee780dc37ed7 100644
--- a/audio/mp3stat/Makefile
+++ b/audio/mp3stat/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	mp3stat
-PORTVERSION=	2.5.11
-PORTREVISION=	2
+PORTVERSION=	2.6.01
 CATEGORIES=	audio
 MASTER_SITES=	https://signal-lost.homeip.net/files/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -19,25 +18,59 @@ COMMENT=	Read information about mp3s and oggs bitstream
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_GNOME=	gtk20
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
 
-PORTDOCS=	README
-PLIST_FILES=	bin/mp3stat
+PLIST_FILES=	bin/mp3stat \
+		lib/mp3stat/input_mp3.so \
+		lib/mp3stat/ui_gtk2.so \
+		lib/mp3stat/ui_console.so
+PLIST_DIRS=	lib/mp3stat
+
+CXX+=		-I${LOCALBASE}/include -L${LOCALBASE}/lib \
+		-Wl,--rpath,${LOCALBASE}/lib
 
 OPTIONS=	VORBIS "Ogg/Vorbis support" on
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 500000
+LIB_DEPENDS+=	magic.1:${PORTSDIR}/sysutils/file
+.endif
+
+.if ${OSVERSION} < 504000
+BUILD_DEPENDS+=	${LOCALBASE}/include/magic.h:${PORTSDIR}/sysutils/file
+.endif
+
 .if defined(WITHOUT_VORBIS)
 MAKE_ARGS+=	VORBIS=""
 .else
 LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
-CXXFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+PLIST_FILES+=	lib/mp3stat/input_vorb.so
 .endif
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	README
+.endif
+
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile*" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|@$${CXX}|$${CXX}|g ; \
+		 s|-ldl||g ; \
+		 s|-lc||g ; \
+		 s|-Wl,-soname,.*\.so\.1||g ; \
+		 s|-fpic|-fPIC|g'
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mp3stat ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/lib/mp3stat
+	${INSTALL_DATA} ${WRKSRC}/ui/gtk/ui_gtk2.so ${PREFIX}/lib/mp3stat
+	${INSTALL_DATA} ${WRKSRC}/ui/console/ui_console.so ${PREFIX}/lib/mp3stat
+	${INSTALL_DATA} ${WRKSRC}/input/mp3/input_mp3.so ${PREFIX}/lib/mp3stat
+.if !defined(WITHOUT_VORBIS)
+	${INSTALL_DATA} ${WRKSRC}/input/vorbis/input_vorb.so ${PREFIX}/lib/mp3stat
+.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
diff --git a/audio/mp3stat/distinfo b/audio/mp3stat/distinfo
index f171d6a42d51..8514db1c2a0f 100644
--- a/audio/mp3stat/distinfo
+++ b/audio/mp3stat/distinfo
@@ -1,2 +1,2 @@
-MD5 (mp3stat_2.5.11.tar.gz) = ac7698cc77b192c702b3fc589cb692d3
-SIZE (mp3stat_2.5.11.tar.gz) = 25682
+MD5 (mp3stat_2.6.01.tar.gz) = 4550c22c154ff8e7486de696bd2c0954
+SIZE (mp3stat_2.6.01.tar.gz) = 30672
diff --git a/audio/mp3stat/files/patch-input_mp3_mp3stat.cpp b/audio/mp3stat/files/patch-input_mp3_mp3stat.cpp
new file mode 100644
index 000000000000..8e72c1f4dd7d
--- /dev/null
+++ b/audio/mp3stat/files/patch-input_mp3_mp3stat.cpp
@@ -0,0 +1,10 @@
+--- input/mp3/mp3stat.cpp.orig	Tue Sep 14 12:50:17 2004
++++ input/mp3/mp3stat.cpp	Tue Sep 14 15:35:44 2004
+@@ -5,6 +5,7 @@
+  * mp3check - check mp3 file for consistency and print infos
+  * Copyright (C) 1998 by Johannes Overmann <overmann@iname.com>
+  */
++#include <unistd.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+ #include <fcntl.h>
diff --git a/audio/mp3stat/files/patch-input_vorbis_oggstat.h b/audio/mp3stat/files/patch-input_vorbis_oggstat.h
new file mode 100644
index 000000000000..d9470caad1cd
--- /dev/null
+++ b/audio/mp3stat/files/patch-input_vorbis_oggstat.h
@@ -0,0 +1,10 @@
+--- input/vorbis/oggstat.h.orig	Thu Sep 16 08:03:59 2004
++++ input/vorbis/oggstat.h	Tue Sep 21 21:08:41 2004
+@@ -5,6 +5,7 @@
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <string>
++#include <cstdio>
+ #include <vorbis/codec.h>
+ 
+ #include "input.h"
diff --git a/audio/mp3stat/files/patch-ui.cpp b/audio/mp3stat/files/patch-ui.cpp
new file mode 100644
index 000000000000..86856e3c02a8
--- /dev/null
+++ b/audio/mp3stat/files/patch-ui.cpp
@@ -0,0 +1,8 @@
+--- ui.cpp.orig	Fri Sep 17 09:54:41 2004
++++ ui.cpp	Tue Sep 21 20:28:28 2004
+@@ -1,4 +1,5 @@
+ #include "ui.h"
++#include <cstdio>
+ 
+ using namespace std;
+ 
diff --git a/audio/mp3stat/files/patch-ui_gtk_gtk2-ui.cpp b/audio/mp3stat/files/patch-ui_gtk_gtk2-ui.cpp
new file mode 100644
index 000000000000..4dac4afd24dd
--- /dev/null
+++ b/audio/mp3stat/files/patch-ui_gtk_gtk2-ui.cpp
@@ -0,0 +1,11 @@
+--- ui/gtk/gtk2_ui.cpp.orig	Mon Sep 20 14:04:50 2004
++++ ui/gtk/gtk2_ui.cpp	Tue Sep 21 22:54:39 2004
+@@ -279,7 +279,7 @@
+ Info               chosen;
+ Info               chosen2;
+   
+-  gtk_init (&argcc, &argvv);
++  gtk_init (NULL, NULL);
+ 
+   cmap = gdk_colormap_get_system ();
+   set_graph_colors ();