Hello all, especially those who worked on GH_* stuff already. :)

This small tweak for bsd.port.mk makes WRKDIST handling more close
to upstream (i.e., Github) handling. It allows to shave a line in
existing port (www/linkchecker) and also helps in my ongoing work
on devel/intellij port. I see no other GH_TAGNAME with slash
mentions in tree.

Unfortunately, this won't help another port I've sent recently
(adobe-fonts reimport proposal), as the situation is much more
complex there.

Okay?
--
WBR,
  Vadim Zhulkov


Index: infrastructure/mk/bsd.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1297
diff -u -p -r1.1297 bsd.port.mk
--- infrastructure/mk/bsd.port.mk       11 Jun 2015 09:26:01 -0000      1.1297
+++ infrastructure/mk/bsd.port.mk       15 Aug 2015 09:55:49 -0000
@@ -777,7 +777,7 @@ GH_ACCOUNT ?=
 GH_PROJECT ?=
 
 .if !empty(GH_TAGNAME)
-WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
+WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C,^v,,:C,/,-,g}
 .elif !empty(GH_COMMIT)
 WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_COMMIT}
 .else
Index: www/linkchecker/Makefile
===================================================================
RCS file: /cvs/ports/www/linkchecker/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- www/linkchecker/Makefile    8 Apr 2015 07:51:54 -0000       1.44
+++ www/linkchecker/Makefile    15 Aug 2015 09:55:49 -0000
@@ -37,7 +37,6 @@ RUN_DEPENDS-x11=      devel/desktop-file-util
 SEPARATE_BUILD=                Yes
 MULTI_PACKAGES=                -main -x11
 
-WRKDIST=       ${WRKDIR}/${GH_PROJECT}-upstream-${V}
 NO_TEST=       Yes
 
 post-extract:

Reply via email to