From abdb1ddb8d86476878678056d232425fa76ef985 Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sat, 22 Aug 2009 19:32:48 +0000
Subject: [PATCH]  - bsd.port.mk - Remove ${INDEXDIR}/${INDEXFILE}.bz2 after
 fetchindex is being run  	PR:		117178 	Submitted by:	krion

 - Fix the problem usage MASTER_SITE_SUBDIR without /
 	PR:		131452
	Submitted by:	osa

Tested:		pointyhat exp-run
---
 Makefile       | 2 +-
 Mk/bsd.port.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index fe96c3dbdea0..d07f3ca4c561 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ index:
 
 fetchindex: ${INDEXDIR}/${INDEXFILE}.bz2
 	@bunzip2 < ${INDEXDIR}/${INDEXFILE}.bz2 > ${INDEXDIR}/${INDEXFILE} && \
-	chmod a+r ${INDEXDIR}/${INDEXFILE}
+	chmod a+r ${INDEXDIR}/${INDEXFILE} && ${RM} -f ${INDEXDIR}/${INDEXFILE}.bz2
 
 ${INDEXDIR}/${INDEXFILE}.bz2: .PHONY
 	@${FETCHINDEX} ${INDEXDIR}/${INDEXFILE}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 6d151593415c..ddb207946dd2 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -2416,7 +2416,7 @@ _PATCH_SITES_DEFAULT?=
 # Organize _{MASTER,PATCH}_SITES_{DEFAULT,[^/:]+} according to grouping
 # rules (:something)
 .for _S in ${MASTER_SITES}
-_S_TEMP=	${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}
+_S_TEMP=	${_S:S/^${_S:C@/?:[^/:]+$@/@}//:S/^://}
 .	if !empty(_S_TEMP)
 .		for _group in ${_S_TEMP:S/,/ /g}
 _G_TEMP=	${_group}