5 files changed, 23 insertions, 15 deletions

diff --git a/audio/mp3_check/Makefile b/audio/mp3_check/Makefile
index 0e03ba410f32..c81e35851b6d 100644
--- a/audio/mp3_check/Makefile
+++ b/audio/mp3_check/Makefile
@@ -11,6 +11,5 @@ MAINTAINER=	ericb@thedeepsky.com
 COMMENT=	Verifies the integrity of mp3 audio files
 
 PLIST_FILES=	bin/mp3_check
-NO_STAGE=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/mp3_check/files/patch-aa b/audio/mp3_check/files/patch-Makefile
index d75fed36f1db..6c68751b27f4 100644
--- a/audio/mp3_check/files/patch-aa
+++ b/audio/mp3_check/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue Oct 24 10:51:53 2000
-+++ Makefile	Tue Oct 24 11:06:47 2000
+--- ./Makefile.orig	2000-07-29 08:41:38.000000000 +0200
++++ ./Makefile	2014-02-14 11:11:34.806983153 +0100
 @@ -2,8 +2,8 @@
  
  CC ?= gcc
@@ -16,7 +16,16 @@
  
  install: all
 -	install -m 755 -o root -g root mp3_check ${LOCALBASE}/bin
-+	install -m 755 -o root -g wheel mp3_check ${LOCALBASE}/bin
++	install -m 755 -o root -g wheel mp3_check ${DESTDIR}${PREFIX}/bin
  
  # The FreeBSD Makefile options need a little work, but this will work for now.
  freebsd:	mp3_check.c mp3_check.h mp3_check_misc.c	
+@@ -29,7 +29,7 @@
+ 		strip mp3_check
+ 
+ freebsd_install:	freebsd
+-			install -m 755 -o root -g wheel mp3_check ${LOCALBASE}/bin
++			install -m 755 -o root -g wheel mp3_check ${DESTDIR}${PREFIX}/bin
+ 
+ mp3_check.o:		mp3_check.c
+ mp3_check_misc.o: 	mp3_check_misc.c
diff --git a/audio/mp3_check/files/patch-ab b/audio/mp3_check/files/patch-ab
deleted file mode 100644
index 5e38cd9f7e70..000000000000
--- a/audio/mp3_check/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- mp3_check.c.orig	Wed May 24 15:48:08 2000
-+++ mp3_check.c	Wed May 24 15:57:41 2000
-@@ -60,6 +60,7 @@
- 
- #include <errno.h>
- #include <stdio.h>
-+#include <getopt.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include "mp3_check.h"
diff --git a/audio/mp3_check/files/patch-mp3_check.c b/audio/mp3_check/files/patch-mp3_check.c
new file mode 100644
index 000000000000..3efd197afdc9
--- /dev/null
+++ b/audio/mp3_check/files/patch-mp3_check.c
@@ -0,0 +1,10 @@
+--- ./mp3_check.c.orig	2000-07-29 08:51:38.000000000 +0200
++++ ./mp3_check.c	2014-02-14 11:10:48.285958149 +0100
+@@ -60,6 +60,7 @@
+ 
+ #include <errno.h>
+ #include <stdio.h>
++#include <getopt.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <getopt.h>
diff --git a/audio/mp3_check/files/patch-mp3_check_misc.c b/audio/mp3_check/files/patch-mp3_check_misc.c
index f271c24cf61b..95af1b4d9306 100644
--- a/audio/mp3_check/files/patch-mp3_check_misc.c
+++ b/audio/mp3_check/files/patch-mp3_check_misc.c
@@ -1,5 +1,5 @@
 --- ./mp3_check_misc.c.orig	2000-09-16 05:36:01.000000000 +0200
-+++ ./mp3_check_misc.c	2013-05-27 14:05:42.403067935 +0200
++++ ./mp3_check_misc.c	2014-02-14 11:10:48.287957674 +0100
 @@ -11,7 +11,7 @@
  #include "support_functions.h"