Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/ffmpeg-devel/Makefile,v
retrieving revision 1.54
diff -u -r1.54 Makefile
--- Makefile	14 May 2005 12:54:19 -0000	1.54
+++ Makefile	14 May 2005 18:42:19 -0000
@@ -27,7 +27,7 @@
 		--enable-shared \
 		--source-path=${WRKSRC}
 
-FFMPEG_CFLAGS=	${CFLAGS} \
+FFMPEG_CFLAGS=	\
 		-I${WRKSRC}/libavcodec \
 		-I${WRKSRC}/libavcodec/i386 \
 		-I${WRKSRC}/libavformat \
@@ -35,14 +35,18 @@
 		-I${X11BASE}/include \
 		-I. -I.. \
 		-L${LOCALBASE}/lib \
-		-L${X11BASE}/lib
-FFMPEG_LDFLAGS=	${LDFLAGS} \
+		-L${X11BASE}/lib \
+		${CFLAGS}
+FFMPEG_LDFLAGS=	\
 		-L${WRKSRC}/libavcodec/libpostproc \
+		-L${WRKSRC}/libavcodec \
+		-L${WRKSRC}/libavformat \
 		-L${LOCALBASE}/lib \
 		-L${X11BASE}/lib \
 		-lm \
 		-fpie \
-		-fPIE
+		-fPIE \
+		${LDFLAGS}
 
 PLIST_SUB=	SHLIB_VERSION=${SHLIB_VERSION}
 INSTALLS_SHLIB=	yes
@@ -73,10 +77,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if (exists(${LOCALBASE}/lib/libavformat.so))
-BROKEN=		'Please remove previous version of ${PORTNAME} to continue build'
-.endif
-
 ##
 ## default options
 ##
Index: files/patch-configure
===================================================================
RCS file: /home/pcvs/ports/multimedia/ffmpeg-devel/files/patch-configure,v
retrieving revision 1.4
diff -u -r1.4 patch-configure
--- files/patch-configure	14 May 2005 00:48:35 -0000	1.4
+++ files/patch-configure	14 May 2005 18:42:19 -0000
@@ -1,11 +1,11 @@
---- configure.orig	Fri May 13 01:19:02 2005
-+++ configure	Fri May 13 01:19:42 2005
-@@ -935,6 +935,8 @@
- builtin_vector=no
- if $cc -o $TMPO $TMPC 2> /dev/null ; then
-   builtin_vector=yes
-+else
-+  builtin_vector=no
- fi
- 
- # dlopen/dlfcn.h probing
+--- configure.orig	Fri May 13 16:57:27 2005
++++ configure	Sat May 14 14:40:55 2005
+@@ -929,8 +929,6 @@
+ int main(void) { 
+ #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
+ return 0;
+-#else
+-#error no vector builtins
+ #endif
+ }
+ EOF