- Unbreak for 5/6/7

PR:		ports/106595
                ports/106596
                ports/106597
                ports/106598
Submitted by:	Jonathan Liu<Net147@hotmail.com>

5 files changed, 41 insertions, 4 deletions

diff --git a/multimedia/xmms-avi/Makefile b/multimedia/xmms-avi/Makefile
index d729f685e8bc..abe4de925480 100644
--- a/multimedia/xmms-avi/Makefile
+++ b/multimedia/xmms-avi/Makefile
@@ -30,10 +30,6 @@ CONFIGURE_ARGS=	--with-win32-path=${LOCALBASE}/lib/win32
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|-lc_r|${PTHREAD_LIBS}|g" ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/multimedia/xmms-avi/files/patch-Cache.cpp b/multimedia/xmms-avi/files/patch-Cache.cpp
new file mode 100644
index 000000000000..05c0fb3e6439
--- /dev/null
+++ b/multimedia/xmms-avi/files/patch-Cache.cpp
@@ -0,0 +1,12 @@
+--- lib/avifile/Cache.cpp.orig	Mon Dec 11 18:12:03 2006
++++ lib/avifile/Cache.cpp	Mon Dec 11 18:12:14 2006
+@@ -410,7 +410,7 @@
+     char** flags;
+     int i;
+     static int caller=0;
+-    flags=new (char*)[MAXSTREAMS];
++    flags=new char*[MAXSTREAMS];
+     mc.add(MAXSTREAMS*4);
+     for(i=0; i<MAXSTREAMS; i++)
+     {
+
diff --git a/multimedia/xmms-avi/files/patch-infotypes.h b/multimedia/xmms-avi/files/patch-infotypes.h
new file mode 100644
index 000000000000..15e45cd9cefb
--- /dev/null
+++ b/multimedia/xmms-avi/files/patch-infotypes.h
@@ -0,0 +1,13 @@
+--- include/infotypes.h.orig	Mon Dec 11 18:13:09 2006
++++ include/infotypes.h	Mon Dec 11 18:13:44 2006
+@@ -1,6 +1,10 @@
+ #ifndef INFOTYPES_H
+ #define INFOTYPES_H
+ 
++#ifdef max
++#undef max
++#endif
++
+ #include <vector>
+ #include <string>
+ #include <map>
diff --git a/multimedia/xmms-avi/files/patch-quantize-pvt.c b/multimedia/xmms-avi/files/patch-quantize-pvt.c
new file mode 100644
index 000000000000..8e7ed8cc05ee
--- /dev/null
+++ b/multimedia/xmms-avi/files/patch-quantize-pvt.c
@@ -0,0 +1,11 @@
+--- lib/audioencoder/lame3.70/quantize-pvt.c.orig	Mon Dec 11 18:14:41 2006
++++ lib/audioencoder/lame3.70/quantize-pvt.c	Mon Dec 11 18:14:59 2006
+@@ -1030,7 +1030,7 @@
+         "jnz loop1\n\n"
+         : /* no outputs */
+         : "t" (istep), "r" (xr), "r" (adj43asm), "r" (ix), "r" (576 / 4), "m" (rx)
+-        : "%eax", "%ebx", "memory", "cc"
++        : "%eax", /* "%ebx", */ "memory", "cc"
+       );
+   }
+ #elif defined (USE_MSC_ASM)
diff --git a/multimedia/xmms-avi/files/patch-win32.h b/multimedia/xmms-avi/files/patch-win32.h
new file mode 100644
index 000000000000..817fd50d1788
--- /dev/null
+++ b/multimedia/xmms-avi/files/patch-win32.h
@@ -0,0 +1,5 @@
+--- lib/loader/win32.h.orig	Mon Dec 11 18:10:09 2006
++++ lib/loader/win32.h	Mon Dec 11 18:10:21 2006
+@@ -1 +1,2 @@
+ int ext_unknown();
++void* LookupExternalByName(const char* library, const char* name);