Unbreak port by switching to fork on Github. The new version has minor

changes, including tweaks for FreeBSD.

PR:		ports/210640
Submitted by:	Mikle Davidkin <me@skylord.ru>

6 files changed, 12 insertions, 67 deletions

diff --git a/multimedia/flvtool++/Makefile b/multimedia/flvtool++/Makefile
index b809c609e5a..617696ce87d 100644
--- a/multimedia/flvtool++/Makefile
+++ b/multimedia/flvtool++/Makefile
@@ -3,21 +3,22 @@
 
 PORTNAME=	flvtool++
 PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
-MASTER_SITES=	http://mirror.facebook.net/facebook/flvtool++/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for hinting and manipulating the metadata of FLV files
 
-BROKEN=		unfetchable
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2016-07-04
+LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	Elbandi
+GH_PROJECT=	flvtool-pp
+GH_TAGNAME=	c0438e8
+
 CFLAGS+=	-I${LOCALBASE}/include/boost
-NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/flvtool++
 USES=		scons
 
diff --git a/multimedia/flvtool++/distinfo b/multimedia/flvtool++/distinfo
index 047ecb95c44..06448c1d50d 100644
--- a/multimedia/flvtool++/distinfo
+++ b/multimedia/flvtool++/distinfo
@@ -1,2 +1,3 @@
-SHA256 (flvtool++-1.2.1.tar.gz) = 291c08fd00abe96f92ca153a57e652133d53d3da6c02777e42fb78f9ac0f4ca6
-SIZE (flvtool++-1.2.1.tar.gz) = 15217
+TIMESTAMP = 1467057524
+SHA256 (Elbandi-flvtool-pp-1.2.1-c0438e8_GH0.tar.gz) = 8c3f4d3b459b324716ce6479354072b50f0057f2a84b4d698bd1344203f9b373
+SIZE (Elbandi-flvtool-pp-1.2.1-c0438e8_GH0.tar.gz) = 17140
diff --git a/multimedia/flvtool++/files/patch-AMFData.h b/multimedia/flvtool++/files/patch-AMFData.h
deleted file mode 100644
index 9fe2b98024e..00000000000
--- a/multimedia/flvtool++/files/patch-AMFData.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-SConstruct b/multimedia/flvtool++/files/patch-SConstruct
index 114560c0d4e..4ff1d4293b6 100644
--- a/multimedia/flvtool++/files/patch-SConstruct
+++ b/multimedia/flvtool++/files/patch-SConstruct
@@ -1,5 +1,5 @@
---- SConstruct.orig	2007-09-08 03:24:22.000000000 +0400
-+++ SConstruct	2008-08-21 20:38:10.000000000 +0400
+--- SConstruct.orig	2012-03-09 14:32:30 UTC
++++ SConstruct
 @@ -1,5 +1,7 @@
 +import os
 +
diff --git a/multimedia/flvtool++/files/patch-common.h b/multimedia/flvtool++/files/patch-common.h
deleted file mode 100644
index 5dce479ea6c..00000000000
--- a/multimedia/flvtool++/files/patch-common.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- common.h.orig	2008-08-07 21:56:41.000000000 +0800
-+++ common.h	2008-08-07 21:58:29.000000000 +0800
-@@ -19,6 +19,10 @@
- #include <boost/shared_ptr.hpp>
- #include <stdexcept>
- 
-+#include <sys/endian.h>
-+
-+#define	bswap_64	bswap64
-+
- using std::map;
- using std::vector;
- using std::string;
diff --git a/multimedia/flvtool++/files/patch-serialized_buffer.h b/multimedia/flvtool++/files/patch-serialized_buffer.h
deleted file mode 100644
index d5008a2ef82..00000000000
--- a/multimedia/flvtool++/files/patch-serialized_buffer.h
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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