ports/161609: Update port: audio/discid

[KATO Tsuguru]

>Number:         161609
>Category:       ports
>Synopsis:       Update port: audio/discid
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 14 18:50:13 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update MASTER_SITES and WWW: line
- Support CC/CFLAGS properly

Remove file:
files/patch-aa
files/patch-ab

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/audio/discid/Makefile audio/discid/Makefile
--- /usr/ports/audio/discid/Makefile	2010-08-01 16:53:42.000000000 +0900
+++ audio/discid/Makefile	2011-09-09 03:21:33.000000000 +0900
@@ -6,17 +6,25 @@
 
 PORTNAME=	discid
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	http://family.zawodny.com/~jzawodn/c/discid/	\
-		http://www.breuninger.org/files/distfiles/
+MASTER_SITES=	http://jeremy.zawodny.com/c/discid/
 DISTNAME=	${PORTNAME}-freebsd-${PORTVERSION}
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Identify audio cd in your drive
 
-PLIST_FILES=	bin/discid
 WRKSRC=		${WRKDIR}/freebsd
 
-MAKE_ARGS=	discid
+PLIST_FILES=	bin/discid
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|^void main|int main|' ${WRKSRC}/${PORTNAME}.c
+
+do-build:
+	cd ${WRKSRC} && ${CC} ${CFLAGS} -o ${PORTNAME} ${PORTNAME}.c
+
+do-install:
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff -urN /usr/ports/audio/discid/files/patch-aa audio/discid/files/patch-aa
--- /usr/ports/audio/discid/files/patch-aa	2003-04-06 10:10:47.000000000 +0900
+++ audio/discid/files/patch-aa	1970-01-01 09:00:00.000000000 +0900
@@ -1,9 +0,0 @@
---- discid.c.orig	Sat Apr 14 19:55:24 2001
-+++ discid.c	Mon May 27 18:33:37 2002
-@@ -92,5 +92,5 @@
- }
- 
--void main(void) {
-+int main(void) {
-     unsigned long discid;
-     int tracks, i;
diff -urN /usr/ports/audio/discid/files/patch-ab audio/discid/files/patch-ab
--- /usr/ports/audio/discid/files/patch-ab	2003-04-06 10:10:47.000000000 +0900
+++ audio/discid/files/patch-ab	1970-01-01 09:00:00.000000000 +0900
@@ -1,14 +0,0 @@
---- Makefile.orig	Sun Oct 15 10:08:53 2000
-+++ Makefile	Mon May 27 18:40:23 2002
-@@ -1,3 +1,10 @@
-+
-+all: discid
-+
- discid:	discid.c
- 	gcc -o discid discid.c
--	strip discid
-+	strip discid
-+
-+install:
-+	cp -p discid ${PREFIX}/bin
-+
diff -urN /usr/ports/audio/discid/pkg-descr audio/discid/pkg-descr
--- /usr/ports/audio/discid/pkg-descr	2003-04-06 10:10:47.000000000 +0900
+++ audio/discid/pkg-descr	2011-09-09 03:24:45.000000000 +0900
@@ -1,15 +1,3 @@
-    The discid home page is located at:
-        http://family.zawodny.com/jzawodn/c/discid/
+A C Program to Compute CDDB discids on Linux and FreeBSD.
 
-    There may be bugs in the code as well as in the documentation. If
-    you find either, I'd appreciate a patch or at least a mail message
-    to let me know what's wrong.
-
-    discid has been developed and tested on Linux and FreeBSD.  It may
-    work on other platforms with modification, but I don't know.  If
-    you install it on another platform, I'd like to hear about it. If
-    you develop patches for that platform, I'd REALLY like to hear
-    about it. Send me a note. There's nothing that I know to be
-    platform-dependent in here yet, but you never know.
-
-WWW: http://family.zawodny.com/jzawodn/c/discid/
+WWW: http://jeremy.zawodny.com/c/discid/
>Release-Note:
>Audit-Trail:
>Unformatted: