Index: head/net/unison/Makefile
===================================================================
--- head/net/unison/Makefile	(revision 461337)
+++ head/net/unison/Makefile	(revision 461338)
@@ -1,102 +1,99 @@
 # Created by: Dan Pelleg <dpelleg+unison@cs.cmu.edu>
 # $FreeBSD$
 
 PORTNAME=	unison
-PORTVERSION=	2.48.4
-PORTREVISION=	3
+PORTVERSION=	2.48.15
+DISTVERSIONPREFIX=	v
+DISTVERSIONSUFFIX=	v4
 CATEGORIES=	net
-MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
-DISTFILES=	${EXTRACT_ONLY} ${EXTRA_DOCS}
-DIST_SUBDIR=	${DISTNAME}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	User-level file synchronization tool
 
 LICENSE=	GPLv3
 
 FLAVORS=	x11 nox11
 FLAVOR?=	${FLAVORS[1]}
 
 nox11_PKGNAMESUFFIX= -nox11
 nox11_CONFLICTS_INSTALL=	unison
 
 x11_CONFLICTS_INSTALL=		unison-nox11
 x11_BUILD_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2 \
 			icotool:graphics/icoutils
 x11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2
 x11_RUN_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 USES=		gmake localbase
 USE_OCAML=	yes
-WRKSRC=		${WRKDIR}/src
+WRKSRC_SUBDIR=	src
 NO_OCAML_RUNDEPENDS=yes
 CONFLICTS=	unison-devel-[0-9]*
 MAKE_ENV=	CLIBS="${LIBS:S/^-/-ccopt -/}" COFLAGS="${CFLAGS:C/ *(-[^ ]*) */ -ccopt \"\1 \"/gW}"
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	unison all
 
+USE_GITHUB=     yes
+GH_ACCOUNT=     bcpierce00
+
 DOCS=		BUGS.txt NEWS README
-EXTRA_DOCS=	${DISTNAME}-manual.html \
-		${DISTNAME}-manual.pdf ${DISTNAME}-manual.ps
 
 OPTIONS_DEFINE=		DOCS FSMONITOR
 OPTIONS_DEFAULT?=	FSMONITOR
 
 FSMONITOR_DESC=		Compile and install fsmonitor plugin
 
 OPTIONS_SUB=		YES
 
 FSMONITOR_LIB_DEPENDS=	libinotify.so:devel/libinotify
 
 .if ${FLAVOR} == nox11
 MAKE_ARGS=		UISTYLE=text
 PKGMESSAGE=		${PKGDIR}/pkg-message.nox11
 PLIST_SUB+=		X11="@comment "
 .else
 MAKE_ARGS=		UISTYLE=gtk2
 SUB_FILES=		${PORTNAME}.desktop
 USE_GNOME+=		atk cairo gdkpixbuf2 glib20 gtk20 pango
 USES+=			gettext-runtime
 PLIST_SUB+=		X11=""
 .endif
 
 post-patch-FSMONITOR-off:
 	@${REINPLACE_CMD} -e 's/-include fsmonitor/#&/' \
 		${WRKSRC}/Makefile.OCaml
 
 post-patch:
 .if ${FLAVOR} == nox11
 	@${REINPLACE_CMD} -e 's/CFLAGS/COFLAGS/g' \
 		${WRKSRC}/Makefile.OCaml ${WRKSRC}/fsmonitor/linux/Makefile
 .else
 	@${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \
 		-e 's/CFLAGS/COFLAGS/g' \
 		${WRKSRC}/Makefile.OCaml ${WRKSRC}/fsmonitor/linux/Makefile
 .endif
 
 .if ${FLAVOR} == x11
 post-build:
 	@${ECHO} Building text-only version
 	@${ECHO} ${WRKSRC}
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} UISTYLE=text NAME=unison-text
 	@cd ${WRKSRC}/win32rc && ${LOCALBASE}/bin/icotool -x U.ico
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR}
 .if ${FLAVOR} == x11
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 .endif
 
 do-install-FSMONITOR-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-fsmonitor ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/net/unison/distinfo
===================================================================
--- head/net/unison/distinfo	(revision 461337)
+++ head/net/unison/distinfo	(revision 461338)
@@ -1,9 +1,3 @@
-TIMESTAMP = 1464031624
-SHA256 (unison-2.48.4/unison-2.48.4.tar.gz) = 30aa53cd671d673580104f04be3cf81ac1e20a2e8baaf7274498739d59e99de8
-SIZE (unison-2.48.4/unison-2.48.4.tar.gz) = 1200861
-SHA256 (unison-2.48.4/unison-2.48.4-manual.html) = 2b5674e2fd7751148784a716ce5a03f8cd0a321c8a3bd4343832ed9b83d2d404
-SIZE (unison-2.48.4/unison-2.48.4-manual.html) = 278110
-SHA256 (unison-2.48.4/unison-2.48.4-manual.pdf) = eaf9bf89967eb17c59b98f0a7ba6b6ff260b6c6de73277a633d954ceb42f5f93
-SIZE (unison-2.48.4/unison-2.48.4-manual.pdf) = 516093
-SHA256 (unison-2.48.4/unison-2.48.4-manual.ps) = 8b7aaf70452148e0817ee84db5b0686a9867ec5a1697490113572e0f4669dd0a
-SIZE (unison-2.48.4/unison-2.48.4-manual.ps) = 770305
+TIMESTAMP = 1518118647
+SHA256 (bcpierce00-unison-v2.48.15v4_GH0.tar.gz) = f8c7e982634bbe1ed6510fe5b36b6c5c55c06caefddafdd9edc08812305fdeec
+SIZE (bcpierce00-unison-v2.48.15v4_GH0.tar.gz) = 1911781
Index: head/net/unison/pkg-plist
===================================================================
--- head/net/unison/pkg-plist	(revision 461337)
+++ head/net/unison/pkg-plist	(revision 461338)
@@ -1,11 +1,8 @@
 bin/unison
 %%FSMONITOR%%bin/unison-fsmonitor
 %%X11%%share/applications/unison.desktop
 %%X11%%bin/unison-text
 %%X11%%share/pixmaps/unison.png
 %%PORTDOCS%%%%DOCSDIR%%/BUGS.txt
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.html
-%%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.pdf
-%%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.ps