Update to version 2.5.10

PR:		ports/69185
Submitted by:	Ports Fury

5 files changed, 25 insertions, 138 deletions

diff --git a/audio/mp3stat/Makefile b/audio/mp3stat/Makefile
index 23e14897d9ef..689895030e31 100644
--- a/audio/mp3stat/Makefile
+++ b/audio/mp3stat/Makefile
@@ -7,10 +7,9 @@
 #
 
 PORTNAME=	mp3stat
-PORTVERSION=	2.5.6
-PORTREVISION=	2
+PORTVERSION=	2.5.10
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.cronyx.ru/pub/FreeBSD/ports/distfiles/
+MASTER_SITES=	https://signal-lost.homeip.net/files/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -18,20 +17,31 @@ COMMENT=	Read information about mp3s and oggs bitstream
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-PLIST_FILES=	bin/mp3stat
-USE_GNOME=	gtk12
+USE_GNOME=	gtk20
 USE_GMAKE=	yes
-MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
+MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
 
-.if defined(WITH_VORBIS)
-LIB_DEPENDS=	vorbis.2:${PORTSDIR}/audio/libvorbis
-MAKE_ENV+=	WITH_VORBIS="${WITH_VORBIS}"
+PORTDOCS=	README
+PLIST_FILES=	bin/mp3stat
+
+.if defined(WITHOUT_VORBIS)
+MAKE_ARGS+=	VORBIS=""
+.else
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
+CXXFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+.endif
 
 pre-everything::
 	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want to compile with Ogg/Vorbis support,"
-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_VORBIS=yes\""
+	@${ECHO_MSG} "If you want to compile without Ogg/Vorbis support,"
+	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_VORBIS=yes\""
 	@${ECHO_MSG}
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/mp3stat ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/audio/mp3stat/distinfo b/audio/mp3stat/distinfo
index 5644e8e6745e..dbb76119baee 100644
--- a/audio/mp3stat/distinfo
+++ b/audio/mp3stat/distinfo
@@ -1,2 +1,2 @@
-MD5 (mp3stat_2.5.6.tar.gz) = 1d865b3d0d6c048e6f2f03ddaeff3854
-SIZE (mp3stat_2.5.6.tar.gz) = 25952
+MD5 (mp3stat_2.5.10.tar.gz) = aa5bcec33729883ebbe2ce42d1982e55
+SIZE (mp3stat_2.5.10.tar.gz) = 28367
diff --git a/audio/mp3stat/files/patch-Makefile b/audio/mp3stat/files/patch-Makefile
deleted file mode 100644
index e09b11024a00..000000000000
--- a/audio/mp3stat/files/patch-Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
---- Makefile.orig	Tue Mar 26 14:15:51 2002
-+++ Makefile	Tue Mar 26 14:20:29 2002
-@@ -6,24 +6,26 @@
- 
- BFLAGS		   = $(CXXFLAGS)
- 
--BUILDFLAGS         = -Wall -lvorbis -lvorbisfile -logg `glib-config --cflags` `gtk-config --cflags` `gtk-config --libs` `glib-config --libs` -lm $(BFLAGS)
-+BUILDFLAGS         = -L${LOCALBASE}/lib -lvorbis -lvorbisfile -logg `${GTK_CONFIG} --cflags` `${GTK_CONFIG} --libs` -lm $(BFLAGS)
- #comment out below to enable experimental gtk2 ui
- #BUILDFLAGS         = -Wall -lvorbis -lvorbisfile -logg `pkg-config --cflags gtk+-2.0` `pkg-config --libs gtk+-2.0` -lm $(BFLAGS)
- 
--BUILD2FLAGS	   = -Wall `glib-config --cflags` `gtk-config --cflags` `gtk-config --libs` `glib-config --libs` -lm $(BFLAGS)
-+BUILD2FLAGS	   = `${GTK_CONFIG} --cflags` `${GTK_CONFIG} --libs` -lm $(BFLAGS)
- #comment out below to enable experimental gtk2 ui
- #BUILD2FLAGS        = -Wall `pkg-config --cflags gtk+-2.0` `pkg-config --libs gtk+-2.0` -lm $(BFLAGS)
- 
- #To disable Vorbis support, comment out next line
--VORBIS		 = -DVORBIS
-+ifdef WITH_VORBIS
-+VORBIS		 = -DVORBIS -I${LOCALBASE}/include
-+endif
- 
- #To compile text only utility, comment out next line
- GTK		 = -DGTK
- 
- 
- #Text ui for win32 and *nix  (only built when GTK is commented out)
--TBUILDFLAGS	   = -Wall -lvorbis -lvorbisfile -lm $(BFLAGS)
--TBUILD2FLAGS	   = -Wall -lm $(BFLAGS)
-+TBUILDFLAGS	   = -L${LOCALBASE}/lib -lvorbis -lvorbisfile -lm $(BFLAGS)
-+TBUILD2FLAGS	   = -lm $(BFLAGS)
- 
- #Win32 gtk build flags.  Uncomment these when building in win32  (only tested with gtk2)
- #prebuilt vorbis and ogg libs found at xiph.org do not seem to work when used with cygwin
-@@ -38,6 +40,6 @@
- 
- CPPFLAGS         = -Wall -DVERSION=\"$(VER)\" $(VORBIS) $(WIN32)
- 
--CXX              = g++
-+#CXX              = g++
- 
- include Makefile.rules
diff --git a/audio/mp3stat/files/patch-Makefile.rules b/audio/mp3stat/files/patch-Makefile.rules
deleted file mode 100644
index 28e14a4b01fb..000000000000
--- a/audio/mp3stat/files/patch-Makefile.rules
+++ /dev/null
@@ -1,83 +0,0 @@
---- Makefile.rules.orig	Tue Mar 26 14:21:02 2002
-+++ Makefile.rules	Tue Mar 26 14:22:36 2002
-@@ -18,63 +18,25 @@
- WEBPAGE  = "http://safemode.homeip.net"
- 
- all:
--	@if test -n "$(VORBIS)"; then \
--	    echo "";\
--	    echo "___ building backend ___";\
--	    echo "Using flags: $(BFLAGS)";\
--	    echo "";\
--	    echo "building $(OBJ)";\
--	    $(CXX) $(BFLAGS) $(CPPFLAGS) -c -o $(OBJ) $(OBJSRC);\
--	    echo "building $(OBJ2)";\
--	    $(CXX) $(BFLAGS) $(CPPFLAGS) -c -o $(OBJ2) $(OBJ2SRC);\
--	    echo "";\
--	    echo "___ building frontend ___";\
--	    if test -n "$(GTK)"; then \
--		echo "Using flags: $(BUILDFLAGS)";\
--	        echo "";\
--	        echo "building and linking $(TARGET)";\
--	        $(CXX) $(CPPFLAGS) -o $(TARGET) $(SRC) $(OBJ) $(OBJ2) $(BUILDFLAGS);\
--	    else \
--		echo "Using flags: $(TBUILDFLAGS)";\
--		echo "";\
--		echo "building and linking $(TARGET)";\
--		$(CXX) $(CPPFLAGS) -o $(TARGET) $(TSRC) $(OBJ) $(OBJ2) $(TBUILDFLAGS);\
--	    fi\
--	else \
--	    echo "";\
--	    echo "___ building backend ___";\
--	    echo "Using flags: $(CXXFLAGS)";\
--	    echo "";\
--	    echo "building $(OBJ)";\
--	    $(CXX) $(BFLAGS) $(CPPFLAGS) -c -o $(OBJ) $(OBJSRC);\
--	    echo "";\
--	    echo "___ building frontend ___";\
--	    if test -n "$(GTK)"; then \
--		echo "Using flags: $(BUILD2FLAGS)";\
--		echo "";\
--		echo "building and linking $(TARGET)";\
--		$(CXX) $(CPPFLAGS) -o $(TARGET) $(SRC) $(OBJ) $(BUILD2FLAGS);\
--	    else \
--		echo "Using flags: $(TBUILD2FLAGS)";\
--		echo "";\
--		echo "building and linking $(TARGET)";\
--		$(CXX) $(CPPFLAGS) -o $(TARGET) $(TSRC) $(OBJ) $(TBUILD2FLAGS);\
--	    fi\
--	fi
--	@echo " "
--	@echo "-------------------------------------------"
--	@echo "Vorbis support is set by default."
--	@echo "to disable edit Makefile and comment VORBIS"
--	@echo " "
--	@echo "gtk 1.2 ui built by default, to enable"
--	@echo "gtk 2.0 ui read the Makefile"
--	@echo "To disable, edit Makefile and comment GTK"
--	@echo "-------------------------------------------"
-+ifdef VORBIS
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $(OBJ) $(OBJSRC)
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $(OBJ2) $(OBJ2SRC)
-+ifdef GTK
-+		$(CXX) $(BUILDFLAGS) $(CPPFLAGS) -o $(TARGET) $(SRC) $(OBJ) $(OBJ2)
-+else
-+		$(CXX) $(TBUILDFLAGS) $(CPPFLAGS) -o $(TARGET) $(TSRC) $(OBJ) $(OBJ2)
-+endif
-+else
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $(OBJ) $(OBJSRC)
-+ifdef GTK
-+		$(CXX) $(BUILD2FLAGS) $(CPPFLAGS) -o $(TARGET) $(SRC) $(OBJ)
-+else
-+		$(CXX) $(TBUILD2FLAGS) $(CPPFLAGS) -o $(TARGET) $(TSRC) $(OBJ)
-+endif
-+endif
- 
- clean:
- 	rm -f *.o mp3stat
- 
- install:
--	strip $(TARGET)
--	cp $(TARGET) /usr/local/bin
--
-+	${BSD_INSTALL_PROGRAM} $(TARGET) ${PREFIX}/bin
diff --git a/audio/mp3stat/pkg-descr b/audio/mp3stat/pkg-descr
index 27cb45f693e7..62893ab443f2 100644
--- a/audio/mp3stat/pkg-descr
+++ b/audio/mp3stat/pkg-descr
@@ -9,3 +9,5 @@ give just as much info as the gui version but now defaults to a configurable
 output of 3 pieces of info, name, runtime, avgerage bitrate. The batch mode
 can take mp3s and oggs in the same directory but it cannot (not yet at least)
 recursively run into subdirectories.
+
+WWW: https://signal-lost.homeip.net/