On 2018/07/17 05:47, Leonid Bobrov wrote:
> > Keep this with GH_TAGNAME=v0.8.2 and no PKGNAME and no V.
>
> If I don't set PKGNAME, then I get this:
> $ env FLAVOR="no_x11" make show=FULLPKGNAME
> toxic-0.8.2-no_x11p1
> So I fixed that by taking a look at editors/vim
Congratulations, you found a bug in GH_* handling :-)
vim uses multi-packages so it's a different situation.
This helps for net/toxic, but I need to do more testing.
Index: bsd.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1426
diff -u -p -r1.1426 bsd.port.mk
--- bsd.port.mk 16 Jul 2018 09:11:31 -0000 1.1426
+++ bsd.port.mk 17 Jul 2018 06:56:18 -0000
@@ -596,6 +596,16 @@ BUILD_DEPENDS += textproc/groff>=1.21
_PKG_ARGS += -DUSE_GROFF=1
.endif
+# github related variables
+GH_TAGNAME ?=
+GH_COMMIT ?=
+GH_ACCOUNT ?=
+GH_PROJECT ?=
+
+.if !empty(GH_PROJECT) && !empty(GH_TAGNAME)
+DISTNAME ?= ${GH_PROJECT}-${GH_TAGNAME:C/^v//}
+.endif
+
PKGNAME ?= ${DISTNAME}
FULLPKGNAME ?= ${PKGNAME}${FLAVOR_EXT}
_MASTER ?=
@@ -818,12 +828,6 @@ _WRKDIRS = ${WRKOBJDIR_${PKGPATH}}/${_WR
_WRKDIRS += ${WRKOBJDIR}/${_WRKDIR_STEM}
_WRKDIRS += ${WRKOBJDIR_MFS}/${_WRKDIR_STEM}
-# github related variables
-GH_TAGNAME ?=
-GH_COMMIT ?=
-GH_ACCOUNT ?=
-GH_PROJECT ?=
-
.if !empty(GH_TAGNAME)
WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
.elif !empty(GH_COMMIT)
@@ -834,10 +838,6 @@ WRKDIST ?= ${WRKDIR}
. else
WRKDIST ?= ${WRKDIR}/${DISTNAME}
. endif
-.endif
-
-.if !empty(GH_PROJECT) && !empty(GH_TAGNAME)
-DISTNAME ?= ${GH_PROJECT}-${GH_TAGNAME:C/^v//}
.endif
WRKSRC ?= ${WRKDIST}
