Fix build on AMD64

5 files changed, 67 insertions, 8 deletions

diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 5b9cc37dc268..a425458e9393 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -66,7 +66,7 @@ PLIST_SUB+=	QT="@comment "
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386"
+.if (${ARCH} != "i386") && (${ARCH} != "amd64")
 WITHOUT_A52=yes
 WITHOUT_XVID=yes
 BROKEN=		"Does not compile on !i386"
@@ -276,19 +276,28 @@ post-configure:
 post-install:
 	@${FMT} < ${PKGMESSAGE}
 
-.if ${ARCH} == "i386"
+.if (${ARCH} == "i386")
 RUN_DEPENDS+=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
 
-CONFIGURE_ARGS+=	--enable-x86opt \
-			--enable-win32 \
+CONFIGURE_ARGS+=	--enable-win32 \
 			--with-win32-path=${LOCALBASE}/lib/win32
 
-PLIST_SUB+=	FFMPEG="" WIN32=""
+PLIST_SUB+=	WIN32=""
 .else
-CONFIGURE_ARGS+=	--disable-x86opt --disable-win32 \
+CONFIGURE_ARGS+=	--disable-win32
+
+PLIST_SUB+=	WIN32="@comment "
+.endif
+
+.if (${ARCH} == "i386") || (${ARCH} == "amd64")
+CONFIGURE_ARGS+=	--enable-x86opt
+
+PLIST_SUB+=	FFMPEG=""
+.else
+CONFIGURE_ARGS+=	--disable-x86opt \
 			--disable-ffmpeg
 
-PLIST_SUB+=	FFMPEG="@comment " WIN32="@comment "
+PLIST_SUB+=	FFMPEG="@comment "
 .endif
 
 # hack taken from ogle to make it work with liba52 + djbfft
diff --git a/multimedia/avifile/files/patch-player-main.cpp b/multimedia/avifile/files/patch-player-main.cpp
new file mode 100644
index 000000000000..5101d6faf623
--- /dev/null
+++ b/multimedia/avifile/files/patch-player-main.cpp
@@ -0,0 +1,10 @@
+--- player/main.cpp.bak	Sun May 25 01:24:42 2003
++++ player/main.cpp	Sat Apr  3 21:25:56 2004
+@@ -23,6 +23,7 @@
+ #include <fcntl.h>
+ #ifdef __FreeBSD__
+ #include <floatingpoint.h>
++#include <ieeefp.h>
+ #endif
+ #ifdef __NetBSD__
+ #include <ieeefp.h>
diff --git a/multimedia/avifile/files/patch-plugins-libmad-Makefile.in b/multimedia/avifile/files/patch-plugins-libmad-Makefile.in
new file mode 100644
index 000000000000..3d00839d305f
--- /dev/null
+++ b/multimedia/avifile/files/patch-plugins-libmad-Makefile.in
@@ -0,0 +1,30 @@
+--- plugins/libmad/Makefile.in.orig	Sat Apr  3 21:16:56 2004
++++ plugins/libmad/Makefile.in	Sat Apr  3 21:18:30 2004
+@@ -132,11 +132,10 @@
+ Z_LIBS = @Z_LIBS@
+ qt_version = @qt_version@
+ 
+-SUBDIRS = libmad
++@AMM_USE_LIBMAD_TRUE@SUBDIRS = libmad
+ @AMM_USE_LIBMAD_TRUE@CUSTOMFLAGS = 
+ @AMM_USE_LIBMAD_FALSE@CUSTOMFLAGS = -I$(SUBDIRS)
+ @AMM_USE_LIBMAD_TRUE@CUSTOMLIBS = $(MAD_LIBS)
+-@AMM_USE_LIBMAD_FALSE@CUSTOMLIBS = $(SUBDIRS)/libmad.la
+ 
+ @AMM_USE_MAD_TRUE@pkglib_LTLIBRARIES = mad_audiodec.la
+ 
+@@ -166,13 +165,11 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ @AMM_USE_LIBMAD_FALSE@@AMM_LINK_SHARED_TRUE@mad_audiodec_la_DEPENDENCIES =  \
+-@AMM_USE_LIBMAD_FALSE@@AMM_LINK_SHARED_TRUE@$(SUBDIRS)/libmad.la \
+ @AMM_USE_LIBMAD_FALSE@@AMM_LINK_SHARED_TRUE@../../lib/libaviplay.la
+ @AMM_USE_LIBMAD_TRUE@@AMM_LINK_SHARED_TRUE@mad_audiodec_la_DEPENDENCIES =  \
+ @AMM_USE_LIBMAD_TRUE@@AMM_LINK_SHARED_TRUE@../../lib/libaviplay.la
+ @AMM_USE_LIBMAD_TRUE@@AMM_LINK_SHARED_FALSE@mad_audiodec_la_DEPENDENCIES = 
+-@AMM_USE_LIBMAD_FALSE@@AMM_LINK_SHARED_FALSE@mad_audiodec_la_DEPENDENCIES =  \
+-@AMM_USE_LIBMAD_FALSE@@AMM_LINK_SHARED_FALSE@$(SUBDIRS)/libmad.la
++@AMM_USE_LIBMAD_FALSE@@AMM_LINK_SHARED_FALSE@mad_audiodec_la_DEPENDENCIES = 
+ mad_audiodec_la_OBJECTS =  libmad.lo
+ CXXFLAGS = @CXXFLAGS@
+ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
diff --git a/multimedia/avifile/files/patch-samples-qtrecompress-main.cpp b/multimedia/avifile/files/patch-samples-qtrecompress-main.cpp
new file mode 100644
index 000000000000..609615d6e539
--- /dev/null
+++ b/multimedia/avifile/files/patch-samples-qtrecompress-main.cpp
@@ -0,0 +1,10 @@
+--- samples/qtrecompress/main.cpp.bak	Tue May 27 17:27:19 2003
++++ samples/qtrecompress/main.cpp	Sat Apr  3 21:31:14 2004
+@@ -12,6 +12,7 @@
+ 
+ #ifdef __FreeBSD__
+ #include <floatingpoint.h>
++#include <ieeefp.h>
+ #endif
+ #ifdef __NetBSD__
+ #include <ieeefp.h>
diff --git a/multimedia/avifile/pkg-message b/multimedia/avifile/pkg-message
index 4c78b162c4b4..ebbdad1afbe7 100644
--- a/multimedia/avifile/pkg-message
+++ b/multimedia/avifile/pkg-message
@@ -8,7 +8,7 @@ options USER_LDT
 Please, check the FreeBSD Handbook for instructions
 on building a custom kernel. If you do not know
 where to find it, check the FreeBSD website
-http://www.freebsd.org/
+http://www.FreeBSD.org/
 
 ALSO, remove ~/.avirc configuration file
 prior to running avifile. The newer version