[Midnightbsd-cvs] mports [19062] trunk/Mk/bsd.mport.mk: add partial handling of github distnames

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat May 23 11:17:52 EDT 2015


Revision: 19062
          http://svnweb.midnightbsd.org/mports/?rev=19062
Author:   laffer1
Date:     2015-05-23 11:17:52 -0400 (Sat, 23 May 2015)
Log Message:
-----------
add partial handling of github distnames

Modified Paths:
--------------
    trunk/Mk/bsd.mport.mk

Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk	2015-05-23 15:17:03 UTC (rev 19061)
+++ trunk/Mk/bsd.mport.mk	2015-05-23 15:17:52 UTC (rev 19062)
@@ -291,7 +291,20 @@
 PKGSUBNAME=	${PKGBASE}
 PKGNAME=	${PKGBASE}-${PKGVERSION}
 DISTNAME?=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
+DISTVERSIONFULL=${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
 
+.if defined(USE_GITHUB) && empty(MASTER_SITES:MGHC)
+# Only add in DISTVERSIONFULL if GH_TAGNAME if set by port. Otherwise
+# GH_TAGNAME defaults to DISTVERSIONFULL; Avoid adding DISTVERSIONFULL in twice.
+.  if defined(GH_TAGNAME)
+DISTNAME?=	${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSIONFULL}-${GH_TAGNAME_SANITIZED}
+.  else
+DISTNAME?=	${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME_SANITIZED}
+.  endif
+.else
+DISTNAME?=	${PORTNAME}-${DISTVERSIONFULL}
+.endif
+
 INDEXFILE?=		INDEX-${OSVERSION:C/([0-9]).*/\1/}
 
 PKGCOMPATDIR?=	${LOCALBASE}/lib/compat/pkg



More information about the Midnightbsd-cvs mailing list