35 files changed, 35 insertions, 62 deletions

diff --git a/net-im/ari-yahoo/Makefile b/net-im/ari-yahoo/Makefile
index c66ca24bfd59..bd1c95a76f34 100644
--- a/net-im/ari-yahoo/Makefile
+++ b/net-im/ari-yahoo/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	ari-yahoo
 PORTVERSION=	1.10
 PORTREVISION=	2
 CATEGORIES=	net-im
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A console Yahoo! messenger client
diff --git a/net-im/emesene/Makefile b/net-im/emesene/Makefile
index f1f90cb1454d..08eca40ada53 100644
--- a/net-im/emesene/Makefile
+++ b/net-im/emesene/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	emesene
 PORTVERSION=	1.0.1
 PORTREVISION=	1
 CATEGORIES=	net-im python
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	A MSN Messenger client writen in python
diff --git a/net-im/eva/Makefile b/net-im/eva/Makefile
index 3b5d8d03a01f..bd733a49e8bf 100644
--- a/net-im/eva/Makefile
+++ b/net-im/eva/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	eva
 PORTVERSION=	0.4.1
 PORTREVISION=	6
 CATEGORIES=	net-im kde
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	evaq
+MASTER_SITES=	SF/${PORTNAME}q/${PORTNAME}-0.4/Eva%20${PORTVERSION}
 
 PATCH_SITES=	ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/
 PATCHFILES=	eva-0.4.1_20070504.patch.gz
diff --git a/net-im/gtkyahoo/Makefile b/net-im/gtkyahoo/Makefile
index de7fa8631f81..a34dbf0042f4 100644
--- a/net-im/gtkyahoo/Makefile
+++ b/net-im/gtkyahoo/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gtkyahoo
 PORTVERSION=	0.18.3
 PORTREVISION=	4
 CATEGORIES=	net-im
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gtkyahoo
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yahoo Messenger Client using GTK
diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile
index a6aaa02ec227..833193f56a73 100644
--- a/net-im/ickle/Makefile
+++ b/net-im/ickle/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	ickle
 PORTVERSION=	0.3.2
 PORTREVISION=	6
 CATEGORIES=	net-im devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ICQ2000 protocol implementation
diff --git a/net-im/icmpchat/Makefile b/net-im/icmpchat/Makefile
index d21df3d4ee3b..398d409baba3 100644
--- a/net-im/icmpchat/Makefile
+++ b/net-im/icmpchat/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	icmpchat
 PORTVERSION=	0.6
 CATEGORIES=	net-im
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	icmpchat
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple console-based chat that uses ICMP protocol
diff --git a/net-im/icqlib/Makefile b/net-im/icqlib/Makefile
index 9684e799eb9c..051f7764f44b 100644
--- a/net-im/icqlib/Makefile
+++ b/net-im/icqlib/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	icqlib
 PORTVERSION=	1.0.0
 PORTREVISION=	2
 CATEGORIES=	net-im
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library required by kicq (not libicq)
diff --git a/net-im/jabber.el/Makefile b/net-im/jabber.el/Makefile
index a2c9b03b6aa1..0fb889f017c5 100644
--- a/net-im/jabber.el/Makefile
+++ b/net-im/jabber.el/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	jabber.el
 PORTVERSION=	0.7.1
 CATEGORIES=	net-im elisp
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	emacs-jabber
+MASTER_SITES=	SF/emacs-jabber/emacs-jabber/${PORTVERSION}
 DISTNAME=		emacs-jabber-${PORTVERSION}
 
 MAINTAINER=	m.boyarov@bsd.by
diff --git a/net-im/jwchat/Makefile b/net-im/jwchat/Makefile
index 97be916cbdd9..6a6aace36b71 100644
--- a/net-im/jwchat/Makefile
+++ b/net-im/jwchat/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	jwchat
 PORTVERSION=	1.0.b2
 PORTREVISION=	1
 CATEGORIES=	net-im www
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.0beta2
 DISTNAME=	${PORTNAME}-${PORTVERSION:S,.b,beta,}
 
 MAINTAINER=	pgollucci@FreeBSD.org
diff --git a/net-im/kmerlin/Makefile b/net-im/kmerlin/Makefile
index 5a5e33684ce3..2ad0539051d7 100644
--- a/net-im/kmerlin/Makefile
+++ b/net-im/kmerlin/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	kmerlin
 PORTVERSION=	1.4.2
 PORTREVISION=	6
 CATEGORIES=	net-im
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile
index 72b194c5d52b..eeb3b8eb0987 100644
--- a/net-im/kmess-kde4/Makefile
+++ b/net-im/kmess-kde4/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	kmess
 PORTVERSION=	1.5.p.1
 PORTREVISION=	3
 CATEGORIES=	net-im kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/Older%20versions/1.5pre1
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p./pre/}
 
 MAINTAINER=	freebsd-ports@club-internet.fr
diff --git a/net-im/kmess/Makefile b/net-im/kmess/Makefile
index 72b194c5d52b..eeb3b8eb0987 100644
--- a/net-im/kmess/Makefile
+++ b/net-im/kmess/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	kmess
 PORTVERSION=	1.5.p.1
 PORTREVISION=	3
 CATEGORIES=	net-im kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/Older%20versions/1.5pre1
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p./pre/}
 
 MAINTAINER=	freebsd-ports@club-internet.fr
diff --git a/net-im/libicq2000/Makefile b/net-im/libicq2000/Makefile
index a874d802e0f7..30a48cb8cf2f 100644
--- a/net-im/libicq2000/Makefile
+++ b/net-im/libicq2000/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libicq2000
 PORTVERSION=	0.3.2
 PORTREVISION=	2
 CATEGORIES=	net-im
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An opensource C++ library to support icq2000/2001 protocol
diff --git a/net-im/libjingle/Makefile b/net-im/libjingle/Makefile
index a87295d3b288..0979643c157b 100644
--- a/net-im/libjingle/Makefile
+++ b/net-im/libjingle/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	libjingle
 PORTVERSION=	0.4.0
 CATEGORIES=	net-im
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Google Talk's implementation of Jingle and Jingle-Audio
diff --git a/net-im/libmsn/Makefile b/net-im/libmsn/Makefile
index 312dd24dc7b7..ecd4bd23f0e8 100644
--- a/net-im/libmsn/Makefile
+++ b/net-im/libmsn/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	libmsn
 DISTVERSION=	4.0-beta6
 CATEGORIES=	net-im
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/4.0%20beta%206
 
 MAINTAINER=	decept0@gmail.com
 COMMENT=	A library for connecting to MSN Messenger service
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index d797197be4eb..015d0859d84f 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -10,8 +10,7 @@ PORTNAME?=	libpurple
 PORTVERSION=	2.6.1
 PORTREVISION?=	1
 CATEGORIES?=	net-im
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_PROJECT}
-MASTER_SITE_SUBDIR=	pidgin/Pidgin/${PORTVERSION}
+MASTER_SITES=	SF/pidgin/Pidgin/${PORTVERSION}
 DISTNAME=	pidgin-${PORTVERSION}
 
 MAINTAINER?=	marcus@FreeBSD.org
diff --git a/net-im/libyahoo2/Makefile b/net-im/libyahoo2/Makefile
index 6ddb077c23f9..6ea41f8db0cd 100644
--- a/net-im/libyahoo2/Makefile
+++ b/net-im/libyahoo2/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	libyahoo2
 PORTVERSION=	0.7.7
 CATEGORIES=	net-im
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	chinsan@FreeBSD.org
 COMMENT=	A C library that handles the new Yahoo! Messenger protocol
diff --git a/net-im/licq/Makefile.inc b/net-im/licq/Makefile.inc
index 7d4dff4124b7..e603991de4f8 100644
--- a/net-im/licq/Makefile.inc
+++ b/net-im/licq/Makefile.inc
@@ -10,8 +10,7 @@ CONSOLE_LICQ_VER=	1.3.6
 .if ${PORTNAME} != "base"
 RUN_DEPENDS+=		licq:${PORTSDIR}/${LICQ_PORT}
 .endif
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	licq
+MASTER_SITES=		SF/licq/licq/${LICQ_VER}
 DISTNAME=		${PKGNAMEPREFIX}${LICQ_VER}
 DISTFILES=		${DISTNAME}.tar.bz2
 GNU_CONFIGURE=		yes
diff --git a/net-im/meanwhile/Makefile b/net-im/meanwhile/Makefile
index 4f6ab1b8adf4..8e0fead5ce03 100644
--- a/net-im/meanwhile/Makefile
+++ b/net-im/meanwhile/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	meanwhile
 PORTVERSION=	1.0.2
 PORTREVISION=	2
 CATEGORIES=	net-im
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Open Source implementation of the Lotus Sametime protocol
diff --git a/net-im/msn-proxy/Makefile b/net-im/msn-proxy/Makefile
index fc511225b6b8..69a520468676 100644
--- a/net-im/msn-proxy/Makefile
+++ b/net-im/msn-proxy/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	msn-proxy
 PORTVERSION=	0.7
 CATEGORIES=	net-im
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	loos.br@gmail.com
 COMMENT=	Messenger proxy/control daemon
diff --git a/net-im/pebrot/Makefile b/net-im/pebrot/Makefile
index b0722daabe70..73d5b804ec6f 100644
--- a/net-im/pebrot/Makefile
+++ b/net-im/pebrot/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	pebrot
 PORTVERSION=	0.8.9
 CATEGORIES=	net-im
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Text-based MSN messenger client
diff --git a/net-im/pidgin-birthday-reminder/Makefile b/net-im/pidgin-birthday-reminder/Makefile
index 54b037d00550..2ec36fbf82e2 100644
--- a/net-im/pidgin-birthday-reminder/Makefile
+++ b/net-im/pidgin-birthday-reminder/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	birthday_reminder
 PORTVERSION=	1.2
 PORTREVISION=	2
 CATEGORIES=	net-im
-MASTER_SITES=	SF/pidgin-birthday
+MASTER_SITES=	SF/pidgin-birthday/pidgin-birthday/${PORTVERSION}
 PKGNAMEPREFIX=	pidgin-
 
 MAINTAINER=	avl@FreeBSD.org
diff --git a/net-im/pidgin-birthday_reminder/Makefile b/net-im/pidgin-birthday_reminder/Makefile
index 54b037d00550..2ec36fbf82e2 100644
--- a/net-im/pidgin-birthday_reminder/Makefile
+++ b/net-im/pidgin-birthday_reminder/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	birthday_reminder
 PORTVERSION=	1.2
 PORTREVISION=	2
 CATEGORIES=	net-im
-MASTER_SITES=	SF/pidgin-birthday
+MASTER_SITES=	SF/pidgin-birthday/pidgin-birthday/${PORTVERSION}
 PKGNAMEPREFIX=	pidgin-
 
 MAINTAINER=	avl@FreeBSD.org
diff --git a/net-im/pidgin-latex/Makefile b/net-im/pidgin-latex/Makefile
index 9ad6338f2738..081e0e8486d1 100644
--- a/net-im/pidgin-latex/Makefile
+++ b/net-im/pidgin-latex/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	latex
 PORTVERSION=	1.0
 PORTREVISION=	2
 CATEGORIES=	net-im
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
+MASTER_SITES=	SF/pidgin-${PORTNAME}/pidgin-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	pidgin-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
diff --git a/net-im/pidgin-libnotify/Makefile b/net-im/pidgin-libnotify/Makefile
index 55e68ea5da67..025e8b7d999f 100644
--- a/net-im/pidgin-libnotify/Makefile
+++ b/net-im/pidgin-libnotify/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libnotify
 PORTVERSION=	0.14
 PORTREVISION=	2
 CATEGORIES=	net-im
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	gaim-libnotify
+MASTER_SITES=	SF/gaim-${PORTNAME}/pidgin-${PORTNAME}/pidgin-${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	pidgin-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
diff --git a/net-im/pork/Makefile b/net-im/pork/Makefile
index f02069941113..0a6c9da12c1e 100644
--- a/net-im/pork/Makefile
+++ b/net-im/pork/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=		pork
 PORTVERSION=		0.99.8.1
 CATEGORIES=		net-im
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ojnk
+MASTER_SITES=		SF/ojnk/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=		wxs@FreeBSD.org
 COMMENT=		Console-based AIM client
diff --git a/net-im/py-jabber/Makefile b/net-im/py-jabber/Makefile
index ecd9b79fab97..f2704c416829 100644
--- a/net-im/py-jabber/Makefile
+++ b/net-im/py-jabber/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	jabber
 PORTVERSION=	0.5
 CATEGORIES=	net-im python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	jabberpy
+MASTER_SITES=	SF/${PORTNAME}py/${PORTNAME}py%20libs/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	jabberpy-${PORTVERSION}-0
 
diff --git a/net-im/py-msnp/Makefile b/net-im/py-msnp/Makefile
index d98a051924a1..0d26b53576bc 100644
--- a/net-im/py-msnp/Makefile
+++ b/net-im/py-msnp/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	msnp
 PORTVERSION=	0.4.1
 CATEGORIES=	net-im python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}.py-${PORTVERSION}
 
diff --git a/net-im/py-xmpppy-irc/Makefile b/net-im/py-xmpppy-irc/Makefile
index 07a4cbedcf93..07d1ee7b8049 100644
--- a/net-im/py-xmpppy-irc/Makefile
+++ b/net-im/py-xmpppy-irc/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	xmpppy-irc
 PORTVERSION=	0.3
 CATEGORIES=	net-im python irc
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	xmpppy
+MASTER_SITES=	SF/xmpppy/PyIRCt/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	irc-transport-${PORTVERSION}
 
diff --git a/net-im/tapioca-qt/Makefile b/net-im/tapioca-qt/Makefile
index 8f7c59e43525..d51d88081843 100644
--- a/net-im/tapioca-qt/Makefile
+++ b/net-im/tapioca-qt/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	tapioca-qt
 PORTVERSION=	0.14.1
 PORTREVISION=	4
 CATEGORIES=	net-im
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	tapioca-voip
+MASTER_SITES=	SF/tapioca-voip/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	Framework for VoIP and IP applications
diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile
index 877c3e91c06b..9ca1076b4f3c 100644
--- a/net-im/telepathy-mission-control/Makefile
+++ b/net-im/telepathy-mission-control/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	telepathy-mission-control
 PORTVERSION=	4.67
 PORTREVISION=	1
 CATEGORIES=	net-im devel
-MASTER_SITES=	SF/mission-control
+MASTER_SITES=	SF/mission-control/mission-control/${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Telepathy component to apps to abstract details of connection managers
diff --git a/net-im/telepathy-qt/Makefile b/net-im/telepathy-qt/Makefile
index b923ac3a0b96..1202cc4b6f0a 100644
--- a/net-im/telepathy-qt/Makefile
+++ b/net-im/telepathy-qt/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	telepathy-qt
 PORTVERSION=	0.14.1
 PORTREVISION=	3
 CATEGORIES=	net-im
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	tapioca-voip
+MASTER_SITES=	SF/tapioca-voip/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	Framework for VoIP and IP applications
diff --git a/net-im/tmsnc/Makefile b/net-im/tmsnc/Makefile
index dbfb547aef97..ac068ebc5f50 100644
--- a/net-im/tmsnc/Makefile
+++ b/net-im/tmsnc/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	tmsnc
 PORTVERSION=	0.3.2
 CATEGORIES=	net-im
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/Source%20code%20and%20binaries/${PORTVERSION}
 
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	A textbased (console) MSN client
diff --git a/net-im/trix/Makefile b/net-im/trix/Makefile
index b82bbf7cb27b..fc855536902a 100644
--- a/net-im/trix/Makefile
+++ b/net-im/trix/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	trix
 PORTVERSION=	0.94
 PORTREVISION=	3
 CATEGORIES=	net-im
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	pascalamsg@gmail.com
 COMMENT=	TriX is a chat compatible with 2.0 protocol of the Vypress Chat
diff --git a/net-im/ysm/Makefile b/net-im/ysm/Makefile
index bb10e825494e..3f78995f8f93 100644
--- a/net-im/ysm/Makefile
+++ b/net-im/ysm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	ysm
 PORTVERSION=	7.2.9.9.1
 PORTREVISION=	1
 CATEGORIES=	net-im
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ysmv7
+MASTER_SITES=	SF/${PORTNAME}v7/${PORTNAME}v7/${PORTNAME}v7%202.9.9.1
 DISTNAME=	${PORTNAME}v${PORTVERSION:S/./_/g}
 
 MAINTAINER=	ports@FreeBSD.org