From owner-svn-ports-all@freebsd.org Wed Mar 29 13:11:19 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8E071D234F7; Wed, 29 Mar 2017 13:11:19 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 586A0BA; Wed, 29 Mar 2017 13:11:19 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2TDBIW3079467; Wed, 29 Mar 2017 13:11:18 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2TDBI6q079466; Wed, 29 Mar 2017 13:11:18 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201703291311.v2TDBI6q079466@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 29 Mar 2017 13:11:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437195 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Mar 2017 13:11:19 -0000 Author: mat Date: Wed Mar 29 13:11:18 2017 New Revision: 437195 URL: https://svnweb.freebsd.org/changeset/ports/437195 Log: Fix using GH_SUBDIR for the default distfile when the path had a single directory. Sponsored by: Absolight Modified: head/Mk/bsd.sites.mk (contents, props changed) Modified: head/Mk/bsd.sites.mk ============================================================================== --- head/Mk/bsd.sites.mk Wed Mar 29 12:57:31 2017 (r437194) +++ head/Mk/bsd.sites.mk Wed Mar 29 13:11:18 2017 (r437195) @@ -542,7 +542,7 @@ _SITES_extract:= 690:post-extract-gh-DEF post-extract-gh-DEFAULT: @${RMDIR} ${WRKSRC}/${GH_SUBDIR_DEFAULT} 2>/dev/null || : @${MKDIR} ${WRKSRC}/${GH_SUBDIR_DEFAULT:H} 2>/dev/null || : - @${LN} -s ${GH_SUBDIR_DEFAULT:C/[^\/]//g:C/\//..\//g} ${WRKSRC}/${GH_SUBDIR_DEFAULT} + @${LN} -s ${GH_SUBDIR_DEFAULT:C/[^\/]//g:C/\//..\//g:S/^$/./} ${WRKSRC}/${GH_SUBDIR_DEFAULT} . endif # If there are non default groups . if !empty(_GITHUB_GROUPS:NDEFAULT)