4 files changed, 48 insertions, 14 deletions
diff --git a/multimedia/flvtool++/Makefile b/multimedia/flvtool++/Makefile
index 6f19caea74de..c7a5b30fa31b 100644
--- a/multimedia/flvtool++/Makefile
+++ b/multimedia/flvtool++/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	flvtool++
-PORTVERSION=	1.1
+PORTVERSION=	1.1.7
 CATEGORIES=	multimedia
 MASTER_SITES=	http://mirror.facebook.com/facebook/flvtool++/
 
diff --git a/multimedia/flvtool++/distinfo b/multimedia/flvtool++/distinfo
index 17740b27cc05..9e298d7654da 100644
--- a/multimedia/flvtool++/distinfo
+++ b/multimedia/flvtool++/distinfo
@@ -1,3 +1,3 @@
-MD5 (flvtool++-1.1.tar.gz) = 817e94b46270dd09ae1e88289c38fb7d
-SHA256 (flvtool++-1.1.tar.gz) = 12729726d870edc3c2130837a12a51249f928a6c2bbf11c8d8d5bc7a003d0f90
-SIZE (flvtool++-1.1.tar.gz) = 11071
+MD5 (flvtool++-1.1.7.tar.gz) = 42730de423f7e8cd8555e8a53ed60db4
+SHA256 (flvtool++-1.1.7.tar.gz) = 09831d12c5e227816cfbc12a5f099e5a32119b9d563a0e0d37abca901cd4bdfc
+SIZE (flvtool++-1.1.7.tar.gz) = 13369
diff --git a/multimedia/flvtool++/files/patch-AMFData.h b/multimedia/flvtool++/files/patch-AMFData.h
index 615b9ddf5f3d..9fe2b98024e3 100644
--- a/multimedia/flvtool++/files/patch-AMFData.h
+++ b/multimedia/flvtool++/files/patch-AMFData.h
@@ -1,10 +1,11 @@
---- AMFData.h.orig	2008-08-07 21:59:28.000000000 +0800
-+++ AMFData.h	2008-08-07 21:59:34.000000000 +0800
-@@ -8,7 +8,6 @@
- #pragma once
- 
- #include "common.h"
--#include <byteswap.h>
- #include <float.h>
- #include <math.h>
- #include <netinet/in.h>
+--- AMFData.h.orig	2009-01-22 09:09:49.000000000 +0800
++++ AMFData.h	2009-03-15 01:52:25.000000000 +0800
+@@ -18,7 +18,7 @@
+   #include <architecture/byte_order.h>
+   #define hton64(x) OSSwapHostToBigInt64(x)
+ #else
+-  #include <byteswap.h>
++  #include <sys/endian.h>
+   #if __BYTE_ORDER == __LITTLE_ENDIAN
+     #define hton64(x) bswap_64(x)
+   #else
diff --git a/multimedia/flvtool++/files/patch-serialized_buffer.h b/multimedia/flvtool++/files/patch-serialized_buffer.h
new file mode 100644
index 000000000000..d5008a2ef82f
--- /dev/null
+++ b/multimedia/flvtool++/files/patch-serialized_buffer.h
@@ -0,0 +1,33 @@
+--- serialized_buffer.h.orig	2008-11-05 08:54:15.000000000 +0800
++++ serialized_buffer.h	2009-03-15 01:53:39.000000000 +0800
+@@ -19,13 +19,12 @@
+ 
+ #else // Linux byteswap defs
+ 
+-#include <byteswap.h>
+-#include <endian.h>
++#include <sys/endian.h>
+ 
+ #if __BYTE_ORDER == __LITTLE_ENDIAN
+-  #define BE16(x) __bswap_16(x)
+-  #define BE32(x) __bswap_32(x)
+-  #define BE64(x) __bswap_64(x)
++  #define BE16(x) __bswap16(x)
++  #define BE32(x) __bswap32(x)
++  #define BE64(x) __bswap64(x)
+   #define LE16(x) (x)
+   #define LE32(x) (x)
+   #define LE64(x) (x)
+@@ -33,9 +32,9 @@
+   #define BE16(x) (x)
+   #define BE32(x) (x)
+   #define BE64(x) (x)
+-  #define LE16(x) __bswap_16(x)
+-  #define LE32(x) __bswap_32(x)
+-  #define LE64(x) __bswap_64(x)
++  #define LE16(x) __bswap16(x)
++  #define LE32(x) __bswap32(x)
++  #define LE64(x) __bswap64(x)
+ #endif
+ 
+ #endif