- Update MASTER_SITES and WWW: line

- Respect CC/CFLAGS

PR:		161609
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

4 files changed, 14 insertions, 41 deletions

diff --git a/audio/discid/Makefile b/audio/discid/Makefile
index ee1988339c01..1ebb68289139 100644
--- a/audio/discid/Makefile
+++ b/audio/discid/Makefile
@@ -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@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 --git a/audio/discid/files/patch-aa b/audio/discid/files/patch-aa
deleted file mode 100644
index 7de74028de23..000000000000
--- a/audio/discid/files/patch-aa
+++ /dev/null
@@ -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 --git a/audio/discid/files/patch-ab b/audio/discid/files/patch-ab
deleted file mode 100644
index 852845dc2551..000000000000
--- a/audio/discid/files/patch-ab
+++ /dev/null
@@ -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 --git a/audio/discid/pkg-descr b/audio/discid/pkg-descr
index 9b6a5ec12c0d..5957421f12c3 100644
--- a/audio/discid/pkg-descr
+++ b/audio/discid/pkg-descr
@@ -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/