Index: head/multimedia/flvtool++/Makefile
===================================================================
--- head/multimedia/flvtool++/Makefile	(revision 417736)
+++ head/multimedia/flvtool++/Makefile	(revision 417737)
@@ -1,31 +1,32 @@
 # Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
 
 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
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/local/include/boost-1_33_1|${LOCALBASE}/include|' \
 		${WRKSRC}/SConscript
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/flvtool++ ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/multimedia/flvtool++/distinfo
===================================================================
--- head/multimedia/flvtool++/distinfo	(revision 417736)
+++ head/multimedia/flvtool++/distinfo	(revision 417737)
@@ -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
Index: head/multimedia/flvtool++/files/patch-serialized_buffer.h
===================================================================
--- head/multimedia/flvtool++/files/patch-serialized_buffer.h	(revision 417736)
+++ head/multimedia/flvtool++/files/patch-serialized_buffer.h	(nonexistent)
@@ -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

Property changes on: head/multimedia/flvtool++/files/patch-serialized_buffer.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/flvtool++/files/patch-common.h
===================================================================
--- head/multimedia/flvtool++/files/patch-common.h	(revision 417736)
+++ head/multimedia/flvtool++/files/patch-common.h	(nonexistent)
@@ -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;

Property changes on: head/multimedia/flvtool++/files/patch-common.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/flvtool++/files/patch-AMFData.h
===================================================================
--- head/multimedia/flvtool++/files/patch-AMFData.h	(revision 417736)
+++ head/multimedia/flvtool++/files/patch-AMFData.h	(nonexistent)
@@ -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

Property changes on: head/multimedia/flvtool++/files/patch-AMFData.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/flvtool++/files/patch-SConstruct
===================================================================
--- head/multimedia/flvtool++/files/patch-SConstruct	(revision 417736)
+++ head/multimedia/flvtool++/files/patch-SConstruct	(revision 417737)
@@ -1,11 +1,11 @@
---- 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
 +
  libd = '#lib/'
 -env = Environment(CPPFLAGS='-ggdb -O3 -Wall', LINKFLAGS='-ggdb')
 +env = Environment(CXX=os.environ['CXX'], CXXFLAGS=os.environ['CXXFLAGS'], ENV=os.environ)
  env.TargetSignatures('content')
  
  Export('env libd')