Fix Build on -CURRENT. Merged from:

PR:		45220
Submitted by:	Jens Rehsack <rehsack@liwing.de>

5 files changed, 71 insertions, 1 deletions

diff --git a/audio/id3v2/Makefile b/audio/id3v2/Makefile
index 1bd555796039..1e44c8638fb7 100644
--- a/audio/id3v2/Makefile
+++ b/audio/id3v2/Makefile
@@ -18,4 +18,8 @@ LIB_DEPENDS=	id3-3.8.2:${PORTSDIR}/audio/id3lib \
 
 MAN1=		id3v2.1
 
+do-install:
+                ${INSTALL_PROGRAM} ${WRKSRC}/id3v2 ${PREFIX}/bin
+                ${INSTALL_MAN} ${WRKSRC}/id3v2.1 ${PREFIX}/man/man1
+
 .include <bsd.port.mk>
diff --git a/audio/id3v2/files/patch-aa b/audio/id3v2/files/patch-aa
index 13ca63b4dfdd..201b23dee0e6 100644
--- a/audio/id3v2/files/patch-aa
+++ b/audio/id3v2/files/patch-aa
@@ -2,7 +2,7 @@
 +++ Makefile	Sun Dec 22 03:51:30 2002
 @@ -1,10 +1,9 @@
 -all: id3v2
-+CC=	c++
++CC=	${CXX}
 +PROG=	id3v2
 +SRCS=	id3v2.cpp list.cpp convert.cpp
 +CXXFLAGS+=	-I${DESTDIR}${PREFIX}/include
diff --git a/audio/id3v2/files/patch-convert_cpp b/audio/id3v2/files/patch-convert_cpp
new file mode 100644
index 000000000000..39e2972f0cb5
--- /dev/null
+++ b/audio/id3v2/files/patch-convert_cpp
@@ -0,0 +1,13 @@
+--- convert.cpp.orig	Mon Nov 11 18:53:12 2002
++++ convert.cpp	Mon Nov 11 18:54:36 2002
+@@ -1,6 +1,8 @@
+-#include <iostream.h>
++#include <iostream>
+ #include <id3/tag.h>
+-#include <stdlib.h>
++#include <cstdlib>
++
++using namespace std;
+ 
+ void DeleteTag(int argc, char *argv[], int optind, int whichTags)
+ {
diff --git a/audio/id3v2/files/patch-id3v2_cpp b/audio/id3v2/files/patch-id3v2_cpp
new file mode 100644
index 000000000000..0108f2e4a0e7
--- /dev/null
+++ b/audio/id3v2/files/patch-id3v2_cpp
@@ -0,0 +1,29 @@
+--- id3v2.cpp.orig	Mon Nov 11 18:47:38 2002
++++ id3v2.cpp	Mon Nov 11 18:53:32 2002
+@@ -2,20 +2,21 @@
+ #include <config.h>
+ #endif
+                                                                                 
+-#include <stdio.h>
+-#include <iostream.h>
+-#include <string.h>
++#include <cstdio>
++#include <iostream>
++#include <cstring>
+ #include <id3/tag.h>
+ #include <getopt.h>
+-#include <stdlib.h>
++#include <cstdlib>
+ #include <id3/misc_support.h>
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <unistd.h>
+ 
+ #define VERSION_NUMBER "$Revision: 1.7 $"
+ #define MAXNOFRAMES 1000
++
++using namespace std;
+ 
+ /* Write both tags by default */
+ flags_t UpdFlags = ID3TT_ALL;
diff --git a/audio/id3v2/files/patch-list_cpp b/audio/id3v2/files/patch-list_cpp
new file mode 100644
index 000000000000..f960b6eabfef
--- /dev/null
+++ b/audio/id3v2/files/patch-list_cpp
@@ -0,0 +1,24 @@
+--- list.cpp.orig	Mon Nov 11 18:53:23 2002
++++ list.cpp	Mon Nov 11 18:54:14 2002
+@@ -17,15 +17,17 @@
+ #include <config.h>
+ #endif
+ 
+-#include <iostream.h>
+-#include <string.h>
++#include <iostream>
++#include <cstring>
+ #include <id3/tag.h>
+ #include <getopt.h>
+-#include <stdlib.h>
+-#include <stdio.h>
++#include <cstdlib>
++#include <cstdio>
+ #include <id3/misc_support.h>
+ #include "frametable.h"
+ #include "genre.h"
++
++using namespace std;
+ 
+ char *GetDescription(const ID3_FrameID eFrameID)
+ {