- Remove remaining SFP references (switch these ports to SF)

Approved by:	portmgr (pav)

21 files changed, 21 insertions, 22 deletions

diff --git a/audio/audiere/Makefile b/audio/audiere/Makefile
index 470aec64f995..78158c12e765 100644
--- a/audio/audiere/Makefile
+++ b/audio/audiere/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	audiere
 PORTVERSION=	1.9.4
 PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	SFP/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	SF
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	High-level audio API
diff --git a/audio/smasher/Makefile b/audio/smasher/Makefile
index 19c970783703..649c64374303 100644
--- a/audio/smasher/Makefile
+++ b/audio/smasher/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	smasher
 PORTVERSION=	1.1.0
 CATEGORIES=	audio
-MASTER_SITES=	SFP/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ \
+MASTER_SITES=	SF \
 		http://distfiles.officialunix.com/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
diff --git a/comms/anyremote/Makefile b/comms/anyremote/Makefile
index 2807aa6e9d4f..7a22e0e3d9ea 100644
--- a/comms/anyremote/Makefile
+++ b/comms/anyremote/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	anyremote
 PORTVERSION=	4.18.1
 CATEGORIES=	comms
-MASTER_SITES=	SFP/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	SF
 
 MAINTAINER=	samm@os2.kiev.ua
 COMMENT=	Remote control service over Bluetooth, infrared or tcp/ip networking
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 46faea14e6b6..03e11b100a15 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	phpMyAdmin
 DISTVERSION=	3.2.1
 CATEGORIES=	databases www
-MASTER_SITES=	SFP/phpmyadmin/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${DISTVERSION}-all-languages
 
 MAINTAINER=	m.seaman@infracaninophile.co.uk
diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
index eca6e9b670d0..da1a683ceb7e 100644
--- a/devel/diffuse/Makefile
+++ b/devel/diffuse/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	diffuse
 PORTVERSION=	0.4.0
 CATEGORIES=	devel python
-MASTER_SITES=	SFP/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	SF
 
 MAINTAINER=	marco.broeder@gmx.eu
 COMMENT=	A graphical N-way diff and merge tool written in python
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index 6fdc992bc55d..f1ba541ee208 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0.4
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S/$/:gnome/} \
-		SFP/libsigc/OldFiles:sf
+		SF/libsigc/OldFiles:sf
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0/:gnome
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:sf,gnome
 
diff --git a/graphics/djvulibre-nox11/Makefile b/graphics/djvulibre-nox11/Makefile
index 77fa854f54fb..04f254b95b71 100644
--- a/graphics/djvulibre-nox11/Makefile
+++ b/graphics/djvulibre-nox11/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	3.5.22
 PORTREVISION=	1
 CATEGORIES=	graphics www
 MASTER_SITES=	ftp://ftp.SpringDaemons.com/soft/ \
-		SFP/djvu/DjVuLibre/${PORTVERSION}/
+		SF/djvu/DjVuLibre/${PORTVERSION}
 PKGNAMESUFFIX=	-nox11
 
 MAINTAINER=	stas@FreeBSD.org
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index 6bce9c7c3f2a..6efc1db19dd1 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	3.5.22
 PORTREVISION=	1
 CATEGORIES=	graphics www
 MASTER_SITES=	ftp://ftp.SpringDaemons.com/soft/ \
-		SFP/djvu/DjVuLibre/${PORTVERSION}/
+		SF/djvu/DjVuLibre/${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	DjVu viewers and browser plugin
diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile
index 4a5d45268ca0..4982a98ea87e 100644
--- a/graphics/tulip/Makefile
+++ b/graphics/tulip/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	tulip
 PORTVERSION=	3.1.2
 CATEGORIES=	graphics
-MASTER_SITES=	SFP/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION}/:src \
+MASTER_SITES=	SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION}:src \
     		http://tulip.labri.fr/userHandbook/:doc
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:src \
     		userManual.pdf:doc
diff --git a/irc/znc/Makefile b/irc/znc/Makefile
index 722d66d96dd0..6c4d0a1325ee 100644
--- a/irc/znc/Makefile
+++ b/irc/znc/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	znc
 PORTVERSION=	0.074
 CATEGORIES=	irc ipv6
-MASTER_SITES=	SFP/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	SF
 
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	An advanced IRC bouncer
diff --git a/lang/gambas2-base/Makefile b/lang/gambas2-base/Makefile
index eda292a75969..3559911431ce 100644
--- a/lang/gambas2-base/Makefile
+++ b/lang/gambas2-base/Makefile
@@ -8,9 +8,8 @@
 PORTNAME=	gambas2
 PORTVERSION=	2.15.2
 CATEGORIES?=	lang kde
-MASTER_SITES=	SFP/${PORTNAME:S/2//g}/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	SF/${PORTNAME:S/2//g}/${PORTNAME}/${PORTVERSION}
 PKGNAMESUFFIX?=	-base
-DIST_SUBDIR=	${PORTNAME:S/2//g}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT?=	A basic language with object extensions
diff --git a/lang/seed7/Makefile b/lang/seed7/Makefile
index 383b23b38cdf..5eebdbb3fd0c 100644
--- a/lang/seed7/Makefile
+++ b/lang/seed7/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	seed7
 DISTVERSION=	05_20090816
 CATEGORIES=	lang
-MASTER_SITES=	SFP/${PORTNAME}/${PORTNAME}/${DISTNAME}.tgz/
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTNAME}.tgz
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 EXTRACT_SUFX=	.tgz
 
diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index 89952d372534..fba0ed2a0cc7 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	maxima
 PORTVERSION=	5.19.1
 CATEGORIES=	math tk
-MASTER_SITES=	SFP/maxima/Maxima-source/${PORTVERSION}-source
+MASTER_SITES=	SF/maxima/Maxima-source/${PORTVERSION}-source
 
 MAINTAINER=	bf1783@gmail.com
 COMMENT=	Symbolic mathematics program
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index bc521818cd69..72051a9256d2 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xiphos
 PORTVERSION=	3.1.1
 CATEGORIES=	misc gnome
-MASTER_SITES=	SFP/gnomesword/Xiphos/${PORTVERSION}/
+MASTER_SITES=	SF/gnomesword/Xiphos/${PORTVERSION}
 
 MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	A bible interface utilizing the sword framework
diff --git a/net-im/pidgin-sipe/Makefile b/net-im/pidgin-sipe/Makefile
index f0d93ec1a845..f5bb64f76924 100644
--- a/net-im/pidgin-sipe/Makefile
+++ b/net-im/pidgin-sipe/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	pidgin-sipe
 PORTVERSION=	1.6.1
 PORTREVISION=	1
 CATEGORIES=	net-im
-MASTER_SITES=	SFP/sipe/sipe/${DISTNAME}
+MASTER_SITES=	SF/sipe/sipe/${DISTNAME}
 
 MAINTAINER=	john.c.prather@gmail.com
 COMMENT=	A plugin for Pidgin to provide LCS/OCS connectivity
diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
index 1073b51c10ef..2dfb82a4113b 100644
--- a/net-im/psi/Makefile
+++ b/net-im/psi/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	psi
 PORTVERSION=	0.13
 CATEGORIES=	net-im
-MASTER_SITES=	SFP/${PORTNAME}/Psi/${PORTVERSION}/
+MASTER_SITES=	SF/${PORTNAME}/Psi/${PORTVERSION}
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	A Qt-based Jabber client
diff --git a/sysutils/automounter/Makefile b/sysutils/automounter/Makefile
index 76751ffed214..9fc2938b863e 100644
--- a/sysutils/automounter/Makefile
+++ b/sysutils/automounter/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	automounter
 PORTVERSION=	1.3.4
 CATEGORIES=	sysutils
-MASTER_SITES=	SFP/bsdadminscripts/${PORTNAME}/
+MASTER_SITES=	SF/bsdadminscripts/${PORTNAME}
 
 MAINTAINER=	kamikaze@bsdforen.de
 COMMENT=	Provides scripts to dynamically configure amd
diff --git a/sysutils/ldap-account-manager/Makefile b/sysutils/ldap-account-manager/Makefile
index 10625c07e429..f7e2420928b4 100644
--- a/sysutils/ldap-account-manager/Makefile
+++ b/sysutils/ldap-account-manager/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	ldap-account-manager
 PORTVERSION=	2.7.0
 CATEGORIES=	sysutils www
-MASTER_SITES=	SFP/${PNAME}/LAM/${PORTVERSION}/
+MASTER_SITES=	SF/${PNAME}/LAM/${PORTVERSION}
 DISTNAME=	${PORTNAME:L}-${PORTVERSION}
 
 MAINTAINER=	basil@vpm.net.ua
diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile
index 378914738bdc..a228ff01626f 100644
--- a/textproc/asciidoc/Makefile
+++ b/textproc/asciidoc/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	8.4.5
 PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.methods.co.nz/asciidoc/ \
-		SFP/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
+		SF
 
 MAINTAINER=	peter.schuller@infidyne.com
 COMMENT=	A text document format for writing short documents and man pages
diff --git a/www/aolserver/Makefile b/www/aolserver/Makefile
index fcf140517429..b55e54e2fa7c 100644
--- a/www/aolserver/Makefile
+++ b/www/aolserver/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	4.5.1
 PORTREVISION=	1
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	www
-MASTER_SITES=	SFP/${PORTNAME}/AOLserver/${PORTVERSION}/
+MASTER_SITES=	SF/${PORTNAME}/AOLserver/${PORTVERSION}
 DIST_SUBDIR=	aolserver
 
 MAINTAINER=	mm@FreeBSD.org
diff --git a/www/atutor/Makefile b/www/atutor/Makefile
index a64c96c32da6..3fde96661f36 100644
--- a/www/atutor/Makefile
+++ b/www/atutor/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	atutor
 PORTVERSION=	1.6.3
 CATEGORIES=	www
-MASTER_SITES=	SFP/${PORTNAME}/ATutor/ATutor%20${PORTVERSION}/
+MASTER_SITES=	SF/${PORTNAME}/ATutor/ATutor%20${PORTVERSION}
 DISTNAME=	ATutor-${PORTVERSION}
 
 MAINTAINER=	wenheping@gmail.com