Index: branches/2015Q2/multimedia/openh264/Makefile
===================================================================
--- branches/2015Q2/multimedia/openh264/Makefile	(revision 383867)
+++ branches/2015Q2/multimedia/openh264/Makefile	(revision 383868)
@@ -1,73 +1,71 @@
 # $FreeBSD$
 
 PORTNAME=	openh264
 PORTVERSION=	1.4.0
-PORTREVISION=	1
+DISTVERSIONPREFIX=v
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Cisco implementation of H.264 codec
 
 LICENSE=	BSD2CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cisco
-GH_PROJECT=	${PORTNAME}
-GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	3a75956
 
 USES=		gmake
 USE_LDCONFIG=	yes
 MAKE_ARGS=	OS=freebsd ARCH="${ARCH:S/amd64/x86_64/}" \
 		CFLAGS_OPT="" CFLAGS_DEBUG=""
 ALL_TARGET=	all
 
 OPTIONS_DEFINE=	DEBUG PLUGINS TEST
 OPTIONS_DEFAULT=PLUGINS
 OPTIONS_SUB=	yes
 
 DEBUG_MAKE_ARGS=BUILDTYPE=Debug
 PLUGINS_BUILD_DEPENDS=gmp-api>=34.0:${PORTSDIR}/multimedia/gmp-api
 #			gmp-api<36.0:${PORTSDIR}/multimedia/gmp-api
 PLUGINS_CFLAGS=	-I${LOCALBASE}/include/gmp-api
 PLUGINS_MAKE_ARGS=HAVE_GMP_API=Yes
 PLUGINS_ALL_TARGET=plugin
 PLUGINS_USES=	webplugin:gecko
 WEBPLUGIN_NAME=	gmp-gmp${PORTNAME}
 WEBPLUGIN_FILES=gmp${PORTNAME}.info libgmp${PORTNAME}.so
 SUB_FILES+=	gmp${PORTNAME}.js
 SUB_LIST+=	PORTVERSION=${PORTVERSION} WEBPLUGIN_DIR="${WEBPLUGIN_DIR}"
 
 TEST_BUILD_DEPENDS=googletest>=1.6.0:${PORTSDIR}/devel/googletest
 TEST_CFLAGS=	-I${LOCALBASE}/include
 TEST_MAKE_ARGS=	HAVE_GTEST=Yes
 TEST_ALL_TARGET=test
 
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MDEBUG}
 . if ${ARCH} == amd64 || ${ARCH} == arm || ${ARCH} == i386
 BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 . endif
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e '/gtest-targets\.mk/d' \
 		-e '/pkgconfig/s/lib/libdata/' \
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's,@prefix@,${PREFIX},' \
 		${WRKSRC}/${PORTNAME}.pc.in
 
 pre-build:
 	${LN} -sf ${LOCALBASE}/lib/libgtest.so ${WRKSRC}/libgtest.a
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.0
 .if ${PORT_OPTIONS:MPLUGINS}
 	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR}
 	${INSTALL_DATA} ${WRKSRC}/gmp${PORTNAME}.info ${STAGEDIR}${WEBPLUGIN_DIR}
 	${INSTALL_LIB} ${WRKSRC}/libgmp${PORTNAME}.so ${STAGEDIR}${WEBPLUGIN_DIR}
 	${INSTALL_DATA} ${WRKDIR}/gmp${PORTNAME}.js ${STAGEDIR}${WEBPLUGIN_DIR}
 .endif
 
 .include <bsd.port.mk>
Index: branches/2015Q2/multimedia/openh264/distinfo
===================================================================
--- branches/2015Q2/multimedia/openh264/distinfo	(revision 383867)
+++ branches/2015Q2/multimedia/openh264/distinfo	(revision 383868)
@@ -1,2 +1,2 @@
-SHA256 (openh264-1.4.0.tar.gz) = 905ab019c9a734ef49e7da3e7846bfc1db3602ddb1ff6828f8442dd3e0375726
-SIZE (openh264-1.4.0.tar.gz) = 37682134
+SHA256 (openh264-v1.4.0_GH0.tar.gz) = a1b9a7a7f1ee204793c613789a505f0971bc2b03b3dbd8f05d9c4a3f3b900a22
+SIZE (openh264-v1.4.0_GH0.tar.gz) = 37681189
Index: branches/2015Q2
===================================================================
--- branches/2015Q2	(revision 383867)
+++ branches/2015Q2	(revision 383868)

Property changes on: branches/2015Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r383772