Hi,

there's something weird regarding how newer versions are supposed to be
handled here: we don't encode the full upstream version in the
DISTNAME/PKGNAME, so right now we can't easily bump from 2.48.15v3 to
2.48.15v4* because the distfile name would be the same, but with
different content/checksum.

The diff below encodes the full tag name in DISTNAME, and uses "pl"
("patch level") to encode the version in PKGNAME.
Since 2.48.15p1 < 2.48.15pl3, REVISION can be dropped.  make update
tested with the no_x11 FLAVOR.

ok?

* has fixes for OCaml>=4.06, needed for chrisz's update to 4.07


Index: Makefile
===================================================================
RCS file: /cvs/ports/net/unison/2.4x/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile    4 Sep 2018 12:46:19 -0000       1.3
+++ Makefile    4 Feb 2019 15:37:15 -0000
@@ -2,12 +2,11 @@
 
 VER=           2.48.15
 REV=           v3
-REVISION=      1
 GH_TAGNAME=    v${VER}${REV}
-DISTNAME=      ${GH_PROJECT}-${VER}
+PKGNAME=       unison-${VER}${REV:S/^v/pl/}
 
 PORTROACH=     limit:^2\.4
 
-WRKDIST=       ${WRKDIR}/${PKGNAME}${REV}/src
+WRKDIST=       ${WRKDIR}/${DISTNAME}/src
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/unison/2.4x/distinfo,v
retrieving revision 1.1
diff -u -p -r1.1 distinfo
--- distinfo    26 Apr 2018 21:34:23 -0000      1.1
+++ distinfo    4 Feb 2019 15:37:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (unison-2.48.15.tar.gz) = 2DfbASwkH4/0Bdu5a/0EnirXc4n8LVv78gjyOpvfSuI=
-SIZE (unison-2.48.15.tar.gz) = 1911724
+SHA256 (unison-2.48.15v3.tar.gz) = 2DfbASwkH4/0Bdu5a/0EnirXc4n8LVv78gjyOpvfSuI=
+SIZE (unison-2.48.15v3.tar.gz) = 1911724


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply via email to