6 files changed, 20 insertions, 46 deletions
diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index facc242e47e..cf84152b05c 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	x264
 PORTVERSION=	0.0.20060926
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.videolan.org/pub/videolan/x264/snapshots/
 DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245
diff --git a/multimedia/x264-devel/files/patch-encoder_ratecontrol.c b/multimedia/x264-devel/files/patch-encoder_ratecontrol.c
deleted file mode 100644
index 7e10b7b2829..00000000000
--- a/multimedia/x264-devel/files/patch-encoder_ratecontrol.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- encoder/ratecontrol.c.orig  Thu May 11 13:35:36 2006
-+++ encoder/ratecontrol.c       Thu May 11 13:36:57 2006
-@@ -38,6 +38,9 @@
- #if defined(SYS_FREEBSD) || defined(SYS_BEOS) || defined(SYS_NETBSD)
- #define exp2f(x) powf( 2, (x) )
- #endif
-+#if defined(__FreeBSD__) && (__FreeBSD__ < 5)
-+#define isfinite(val) (!isnan((val)) && !isinf((val)))
-+#endif
- #if defined(SYS_MACOSX)
- #define exp2f(x) (float)pow( 2, (x) )
- #define sqrtf sqrt
-
diff --git a/multimedia/x264-devel/pkg-plist b/multimedia/x264-devel/pkg-plist
index 8485966a928..52b74f4877c 100644
--- a/multimedia/x264-devel/pkg-plist
+++ b/multimedia/x264-devel/pkg-plist
@@ -1,16 +1,16 @@
 bin/x264
 %%GTK%%bin/x264_gtk_encode
 include/x264.h
-%%GTK%%binclude/x264_gtk.h
-%%GTK%%binclude/x264_gtk_enum.h
+%%GTK%%include/x264_gtk.h
+%%GTK%%include/x264_gtk_enum.h
 lib/libx264.a
 lib/libx264.so
 lib/libx264.so.50
-%%GTK%%blib/libx264gtk.a
-%%GTK%%blib/libx264gtk.so
-%%GTK%%blib/libx264gtk.so.50
+%%GTK%%lib/libx264gtk.a
+%%GTK%%lib/libx264gtk.so
+%%GTK%%lib/libx264gtk.so.50
 libdata/pkgconfig/x264.pc
-%%GTK%%blibdata/pkgconfig/x264gtk.pc
-%%GTK%%bshare/locale/fr/LC_MESSAGES/x264_gtk.mo
-%%GTK%%b%%DATADIR%%/x264.png
-%%GTK%%b@dirrm %%DATADIR%%
+%%GTK%%libdata/pkgconfig/x264gtk.pc
+%%GTK%%share/locale/fr/LC_MESSAGES/x264_gtk.mo
+%%GTK%%%%DATADIR%%/x264.png
+%%GTK%%@dirrm %%DATADIR%%
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index facc242e47e..cf84152b05c 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	x264
 PORTVERSION=	0.0.20060926
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.videolan.org/pub/videolan/x264/snapshots/
 DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245
diff --git a/multimedia/x264/files/patch-encoder_ratecontrol.c b/multimedia/x264/files/patch-encoder_ratecontrol.c
deleted file mode 100644
index 7e10b7b2829..00000000000
--- a/multimedia/x264/files/patch-encoder_ratecontrol.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- encoder/ratecontrol.c.orig  Thu May 11 13:35:36 2006
-+++ encoder/ratecontrol.c       Thu May 11 13:36:57 2006
-@@ -38,6 +38,9 @@
- #if defined(SYS_FREEBSD) || defined(SYS_BEOS) || defined(SYS_NETBSD)
- #define exp2f(x) powf( 2, (x) )
- #endif
-+#if defined(__FreeBSD__) && (__FreeBSD__ < 5)
-+#define isfinite(val) (!isnan((val)) && !isinf((val)))
-+#endif
- #if defined(SYS_MACOSX)
- #define exp2f(x) (float)pow( 2, (x) )
- #define sqrtf sqrt
-
diff --git a/multimedia/x264/pkg-plist b/multimedia/x264/pkg-plist
index 8485966a928..52b74f4877c 100644
--- a/multimedia/x264/pkg-plist
+++ b/multimedia/x264/pkg-plist
@@ -1,16 +1,16 @@
 bin/x264
 %%GTK%%bin/x264_gtk_encode
 include/x264.h
-%%GTK%%binclude/x264_gtk.h
-%%GTK%%binclude/x264_gtk_enum.h
+%%GTK%%include/x264_gtk.h
+%%GTK%%include/x264_gtk_enum.h
 lib/libx264.a
 lib/libx264.so
 lib/libx264.so.50
-%%GTK%%blib/libx264gtk.a
-%%GTK%%blib/libx264gtk.so
-%%GTK%%blib/libx264gtk.so.50
+%%GTK%%lib/libx264gtk.a
+%%GTK%%lib/libx264gtk.so
+%%GTK%%lib/libx264gtk.so.50
 libdata/pkgconfig/x264.pc
-%%GTK%%blibdata/pkgconfig/x264gtk.pc
-%%GTK%%bshare/locale/fr/LC_MESSAGES/x264_gtk.mo
-%%GTK%%b%%DATADIR%%/x264.png
-%%GTK%%b@dirrm %%DATADIR%%
+%%GTK%%libdata/pkgconfig/x264gtk.pc
+%%GTK%%share/locale/fr/LC_MESSAGES/x264_gtk.mo
+%%GTK%%%%DATADIR%%/x264.png
+%%GTK%%@dirrm %%DATADIR%%