diff -ruN --exclude=CVS /usr/ports/mail/fetchmail/Makefile /tmp/ports/mail/fetchmail/Makefile
--- /usr/ports/mail/fetchmail/Makefile	Mon Apr  9 22:04:05 2007
+++ /tmp/ports/mail/fetchmail/Makefile	Tue Apr 10 11:30:47 2007
@@ -12,10 +12,12 @@
 PORTNAME=	fetchmail
 PORTVERSION=	6.3.8
 CATEGORIES=	mail ipv6
-MASTER_SITES=	${MASTER_SITE_BERLIOS}/%SUBDIR%/ \
-		http://home.pages.de/~mandree/%SUBDIR%/ \
-		http://home.leo.org/~barner/freebsd/distfiles/
-MASTER_SITE_SUBDIR=	fetchmail
+MASTER_SITES=	${MASTER_SITE_BERLIOS} \
+		${MASTER_SITE_SUNSITE:S/$/:sunsite/} \
+		http://home.leo.org/~barner/freebsd/distfiles/:leo
+MASTER_SITE_SUBDIR=	fetchmail/:DEFAULT,leo \
+			system/mail/pop/fetchmail/:sunsite
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT,sunsite
 
 MAINTAINER=	barner@FreeBSD.org
 COMMENT=	Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR