svn commit: r461338 - head/net/unison

[Guido Falsi]

Author: madpilot
Date: Fri Feb  9 20:33:59 2018
New Revision: 461338
URL: https://svnweb.freebsd.org/changeset/ports/461338

Log:
  - Update net/unison to 2.48.15 [1]
  - Grab distribution from github [1]
  - Convert to using WRKSRC_SUBDIR
  - Upstream does not provide precompiled pdf, ps, and html manual so remove them from the port
  
  Reported by:	dutchman01 at quicknet.nl [1]
  
  Approved by:	portmgr (previously approved FLAVORS)

Modified:
  head/net/unison/Makefile
  head/net/unison/distinfo
  head/net/unison/pkg-plist

Modified: head/net/unison/Makefile
==============================================================================
--- head/net/unison/Makefile	Fri Feb  9 20:30:39 2018	(r461337)
+++ head/net/unison/Makefile	Fri Feb  9 20:33:59 2018	(r461338)
@@ -2,13 +2,10 @@
 # $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 at FreeBSD.org
 COMMENT=	User-level file synchronization tool
@@ -31,16 +28,17 @@ 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
@@ -89,7 +87,6 @@ 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}

Modified: head/net/unison/distinfo
==============================================================================
--- head/net/unison/distinfo	Fri Feb  9 20:30:39 2018	(r461337)
+++ head/net/unison/distinfo	Fri Feb  9 20:33:59 2018	(r461338)
@@ -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

Modified: head/net/unison/pkg-plist
==============================================================================
--- head/net/unison/pkg-plist	Fri Feb  9 20:30:39 2018	(r461337)
+++ head/net/unison/pkg-plist	Fri Feb  9 20:33:59 2018	(r461338)
@@ -6,6 +6,3 @@ bin/unison
 %%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