Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 4 Sep 2016 10:23:14 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r421322 - head/Mk
Message-ID:  <201609041023.u84ANEMC089478@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Sun Sep  4 10:23:14 2016
New Revision: 421322
URL: https://svnweb.freebsd.org/changeset/ports/421322

Log:
  Improve CHEESESHOP subdir substitution, it didn't work well with
  DISTVERSION containing non digits.
  
  PR:		205762
  With hat:	portmgr

Modified:
  head/Mk/bsd.sites.mk

Modified: head/Mk/bsd.sites.mk
==============================================================================
--- head/Mk/bsd.sites.mk	Sun Sep  4 10:05:45 2016	(r421321)
+++ head/Mk/bsd.sites.mk	Sun Sep  4 10:23:14 2016	(r421322)
@@ -1415,7 +1415,7 @@ MASTER_SITES_SUBDIRS=	APACHE_COMMONS_BIN
 			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} \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609041023.u84ANEMC089478>