- Update to 0.25alpha23-HPR (even though it's modestly labeled "alpha", the new official

  maintainer has provided many fixes and improvements which justify an update)
- Update WWW
- Trim header

Feature safe:   yes

4 files changed, 14 insertions, 64 deletions

diff --git a/audio/mp3guessenc/Makefile b/audio/mp3guessenc/Makefile
index fa49aec0bae2..9d4df192cbb4 100644
--- a/audio/mp3guessenc/Makefile
+++ b/audio/mp3guessenc/Makefile
@@ -1,29 +1,28 @@
-# New ports collection makefile for:	mp3guessenc
-# Date created:				1 Oct 2005
-# Whom:					Emanuel Haupt <ehaupt@critical.ch>
-#
+# Created by: Emanuel Haupt <ehaupt@critical.ch>
 # $FreeBSD$
-#
 
 PORTNAME=	mp3guessenc
-PORTVERSION=	0.21
+DISTVERSION=	${DIST_REL}${ALPHA_REL}
 CATEGORIES=	audio
-MASTER_SITES=	http://shibatch.sourceforge.net/download/ \
-		CRITICAL
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${DIST_REL}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Utility for guessing which encoder was used to encode an mp3 file
 
-USE_ZIP=	yes
-USE_DOS2UNIX=	yes
 MAKE_JOBS_SAFE=	yes
 
-WRKSRC=		${WRKDIR}
+DIST_REL=	0.25
+ALPHA_REL=	alpha23-HPR
 
 PLIST_FILES=	bin/mp3guessenc
+SRC=		decode.c mp3guessenc.c
 
 do-build:
-	${CC} ${CFLAGS} ${WRKSRC}/${PORTNAME}.c -o ${WRKSRC}/${PORTNAME}
+.for f in ${SRC}
+	${CC} ${CFLAGS} ${WRKSRC}/${f} -c -o ${WRKSRC}/${f:C/\.c/.o/}
+.endfor
+	${CC} ${SRC:S|\.c|${WRKSRC}/.o|:S|^|${WRKSRC}/|} \
+		-o ${WRKSRC}/${PORTNAME}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git a/audio/mp3guessenc/distinfo b/audio/mp3guessenc/distinfo
index c363eba29e2d..6ec3d18963b1 100644
--- a/audio/mp3guessenc/distinfo
+++ b/audio/mp3guessenc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mp3guessenc-0.21.zip) = b8d6ec40ef9bf90c739e0a5dc30b9a1eb0da5500e8693fbe486123ebfc90eb34
-SIZE (mp3guessenc-0.21.zip) = 18434
+SHA256 (mp3guessenc-0.25alpha23-HPR.tar.gz) = 50937dcb66d32ab2ff4e560d8f1f437a5d0ea76c9061e96cf78101e2bb84f1bd
+SIZE (mp3guessenc-0.25alpha23-HPR.tar.gz) = 53920
diff --git a/audio/mp3guessenc/files/patch-mp3guessenc.c b/audio/mp3guessenc/files/patch-mp3guessenc.c
deleted file mode 100644
index 1aa1a3be4f79..000000000000
--- a/audio/mp3guessenc/files/patch-mp3guessenc.c
+++ /dev/null
@@ -1,49 +0,0 @@
---- ./mp3guessenc.c.orig	2011-06-21 21:09:47.000000000 +0200
-+++ ./mp3guessenc.c	2011-06-21 21:11:00.000000000 +0200
-@@ -515,6 +515,7 @@
-   for(q--;q >= lame_string && *q == 'U';q--) *q = '\0';
- 
- LSEX_END:  
-+  {}
- }
- 
- ///////////////////////////////////////////////////////
-@@ -541,7 +542,10 @@
-   for(i=0;i<256;i++) lame_string[i] = '\0';
- 
-   input_file = fopen(argv[1],"rb");
--  if (input_file == NULL) exit(0);
-+  if (input_file == NULL) {
-+    printf("Usage: mp3guessenc mp3file\n");
-+    exit(0);
-+  }
- 
-   fseek(input_file,0,SEEK_END);
-   filesize = ftell(input_file);
-@@ -636,7 +640,7 @@
-     {
-       printf("Cannot find valid mp3 header, scanning failed\n");
-       fclose(input_file);
--      return;
-+      return(0);
-     }
- 
-   // read VBR tag
-@@ -669,7 +673,7 @@
-       if (pos == -1) {
- 	printf("Cannot find valid mp3 header, scanning failed\n");
- 	fclose(input_file);
--	return;
-+	return(0);
-       }
-     }
-   }
-@@ -705,7 +709,7 @@
- 	    "Free format bitstream is not supported.\n"
- 	    "Sorry.\n");
-     fclose(input_file);
--    return;
-+    return(0);
-   }
- 
-   crc = (head >> 16) & 1;
diff --git a/audio/mp3guessenc/pkg-descr b/audio/mp3guessenc/pkg-descr
index f54fcb9cd3c6..969d965fe4e4 100644
--- a/audio/mp3guessenc/pkg-descr
+++ b/audio/mp3guessenc/pkg-descr
@@ -5,4 +5,4 @@ Each encoder has unique characteristics fingerprinted into each file. This
 program analyzes algorithms that are used in any given file and determines which
 encoder was used. For example the Xing encoder never uses short blocks.
 
-WWW: http://shibatch.sourceforge.net
+WWW: http://mp3guessenc.sourceforge.net/