aboutsummaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authorantoine <antoine@FreeBSD.org>2016-09-04 18:23:14 +0800
committerantoine <antoine@FreeBSD.org>2016-09-04 18:23:14 +0800
commitb19d7247b19399fa427f92d8fc1af1ed1c415e53 (patch)
tree7423d437cc5e47042f5516d331da1430f79a927b /Mk
parented9fbdbc02a520ffa6765d23a2fe6432705e028d (diff)
downloadfreebsd-ports-gnome-b19d7247b19399fa427f92d8fc1af1ed1c415e53.tar.gz
freebsd-ports-gnome-b19d7247b19399fa427f92d8fc1af1ed1c415e53.tar.zst
freebsd-ports-gnome-b19d7247b19399fa427f92d8fc1af1ed1c415e53.zip
Improve CHEESESHOP subdir substitution, it didn't work well with
DISTVERSION containing non digits. PR: 205762 With hat: portmgr
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.sites.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index bb26743ead3d..05512285ef70 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -1415,7 +1415,7 @@ MASTER_SITES_SUBDIRS= APACHE_COMMONS_BINARIES:${PORTNAME:S,commons-,,} \
APACHE_COMMONS_SOURCE:${PORTNAME:S,commons-,,} \
APACHE_JAKARTA:${PORTNAME:S,-,/,}/source \
BERLIOS:${PORTNAME:tl}.berlios \
- CHEESESHOP:source/${DISTNAME:C/(.).*/\1/}/${DISTNAME:C/(.*)-[0-9].*/\1/} \
+ CHEESESHOP:source/${DISTNAME:C/(.).*/\1/}/${DISTNAME:S/-${DISTVERSIONFULL}$//} \
DEBIAN:pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME} \
FARSIGHT:${PORTNAME} \
FESTIVAL:${PORTVERSION} \