10 files changed, 12 insertions, 12 deletions

diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index 24adf86c8b0a..55e0737c3703 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	unzip
 PORTVERSION=	5.52
 PORTREVISION=	2
 CATEGORIES?=	archivers
-MASTER_SITES=	ftp://ftp.info-zip.org/pub/infozip/src/ \
-		${MASTER_SITE_TEX_CTAN:S,%SUBDIR%,tools/zip/info-zip/src/,}
+MASTER_SITES=	ftp://ftp.info-zip.org/pub/infozip/src/ ${MASTER_SITE_TEX_CTAN}
+MASTER_SITE_SUBDIR=	tools/zip/info-zip/src
 DISTNAME=	${PORTNAME}552
 
 MAINTAINER?=	ache@FreeBSD.org
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 87153f7431dc..4c462957453a 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	zip
 PORTVERSION=	2.32
 CATEGORIES=	archivers
-MASTER_SITES=	http://ftp.info-zip.org/pub/infozip/src/ \
-		${MASTER_SITE_TEX_CTAN:S,%SUBDIR%,tools/zip/info-zip/src/,}
+MASTER_SITES=	http://ftp.info-zip.org/pub/infozip/src/ ${MASTER_SITE_TEX_CTAN}
+MASTER_SITE_SUBDIR=	tools/zip/info-zip/src
 DISTFILES=	zip232${EXTRACT_SUFX}
 
 MAINTAINER=	ache@FreeBSD.org
diff --git a/cad/admesh/Makefile b/cad/admesh/Makefile
index e903bfa72221..ad1ca973c1d1 100644
--- a/cad/admesh/Makefile
+++ b/cad/admesh/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	admesh
 PORTVERSION=	0.95
 CATEGORIES=	cad
-MASTER_SITES=	http://www.varlog.com//products/admesh/files/
+MASTER_SITES=	http://www.varlog.com/products/admesh/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Program for processing STL triangulated solid meshes
diff --git a/converters/enca/Makefile b/converters/enca/Makefile
index cfe45e999175..cebcfb7d5d39 100644
--- a/converters/enca/Makefile
+++ b/converters/enca/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	enca
 PORTVERSION=	1.9
 CATEGORIES=	converters textproc russian ukrainian
-MASTER_SITES=	http://trific.ath.cx/Ftp//enca/ \
+MASTER_SITES=	http://trific.ath.cx/Ftp/enca/ \
 		http://freebsd.unixfreunde.de/sources/
 
 MAINTAINER=	never@nevermind.kiev.ua
diff --git a/dns/bind9-dlz/Makefile b/dns/bind9-dlz/Makefile
index 69d88b45975d..39a83e17bb5e 100644
--- a/dns/bind9-dlz/Makefile
+++ b/dns/bind9-dlz/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	bind9
 PORTVERSION=	${ISCVERSION}+${DLZVERSION}
 CATEGORIES=	dns ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,dns/bind9/${ISCVERSION}/,} \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,dns/bind9/${ISCVERSION},} \
 		${MASTER_SITES_DLZ:S/$/:dlz/}
 MASTER_SITE_SUBDIR=	bind9/${ISCVERSION} bind-dlz/:dlz
 PKGNAMESUFFIX?=	-dlz${POSTGRESQL_SUFFIX}${MYSQL_SUFFIX}${BERKLEYDB_SUFFIX}${LDAP_SUFFIX}${PKGNAMESUFFIX2}
diff --git a/games/frozenbubble/Makefile b/games/frozenbubble/Makefile
index c513f165fe08..f09e45878d20 100644
--- a/games/frozenbubble/Makefile
+++ b/games/frozenbubble/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	frozenbubble
 PORTVERSION=	1.0.0
 PORTREVISION=	1
 CATEGORIES=	games
-MASTER_SITES=	http://zarb.org/~gc/fb//
+MASTER_SITES=	http://zarb.org/~gc/fb/
 DISTNAME=	frozen-bubble-${PORTVERSION}
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/mail/altermime/Makefile b/mail/altermime/Makefile
index b33b11478e88..aa3854f18111 100644
--- a/mail/altermime/Makefile
+++ b/mail/altermime/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	altermime
 PORTVERSION=	0.3.7
 CATEGORIES=	mail textproc
 MASTER_SITES=	http://www.pldaniels.com/altermime/ \
-	http://sce-tindy.tecnik93.com//FreeBSD/ports/altermime/sources/
+	http://sce-tindy.tecnik93.com/FreeBSD/ports/altermime/sources/
 
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Small C program which is used to alter your mime-encoded mailpacks
diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index 15432b462ab4..82faef54d173 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	${ELM_VERSION}.${ELM_REVISION}${ELM_PATCHLEVEL:S/_//}
 CATEGORIES=	mail
 MASTER_SITES=	http://www.elmme-mailer.org/ \
 	ftp://ftp.elmme-mailer.org/elmme-mailer.org/src/elm-2.4ME+/ \
-	ftp://ftp.funet.fi//pub/unix/mail/elm/elm-2.4ME+/
+	ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/
 DISTNAME=	elm-${ELM_VERSION}ME+${ELM_REVISION}
 
 PATCH_SITES=	${MASTER_SITES}
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 2a39feaf45f5..bc3f3f1195d4 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.6.8
 PORTREVISION=	2
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://rsync.samba.org/ftp/%SUBDIR%/ \
-		ftp://ftp.samba.org//pub/%SUBDIR%/ \
+		ftp://ftp.samba.org/pub/%SUBDIR%/ \
 		ftp://sunsite.auc.dk/pub/unix/%SUBDIR%/  \
 		ftp://ftp.sunet.se/pub/unix/admin/%SUBDIR%/  \
 		ftp://ftp.fu-berlin.de/pub/unix/network/%SUBDIR%/ \
diff --git a/sysutils/wmzazof/Makefile b/sysutils/wmzazof/Makefile
index 904e87be3ccf..eef07eec5b86 100644
--- a/sysutils/wmzazof/Makefile
+++ b/sysutils/wmzazof/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	wmzazof
 PORTVERSION=	0.3
 PORTREVISION=	1
 CATEGORIES=	sysutils windowmaker
-MASTER_SITES=	http://users.chello.be/cr49940//wmzazof/
+MASTER_SITES=	http://users.chello.be/cr49940/wmzazof/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple dockapp that displays the uptime, free and used memory