--- Mk/bsd.sites.mk.orig	2009-08-11 08:58:24.000000000 +0200
+++ Mk/bsd.sites.mk	2009-08-12 17:50:02.000000000 +0200
@@ -743,6 +743,13 @@
 	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,X/kde/&,}
 .endif
 
+.if !defined(IGNORE_MASTER_SITE_LOGILAB)
+MASTER_SITE_LOGILAB+=	\
+	http://www.logilab.org/ftp/pub/%SUBDIR%/ \
+	ftp://ftp.logilab.org/pub/%SUBDIR%/ \
+	ftp://ftp.logilab.fr/pub/%SUBDIR%/
+.endif
+
 .if !defined(IGNORE_MASTER_SITE_MOZDEV)
 MASTER_SITE_MOZDEV+= \
 	http://ftp.scarlet.be/pub/mozdev/%SUBDIR%/ \
--- deskutils/narval/Makefile.orig	2009-07-31 15:49:57.000000000 +0200
+++ deskutils/narval/Makefile	2009-08-12 17:51:29.000000000 +0200
@@ -10,8 +10,8 @@
 PORTVERSION=	2.0.2
 PORTREVISION=	4
 CATEGORIES=	deskutils python
-MASTER_SITES=	ftp://ftp.logilab.org/pub/narval/ \
-		http://www.logilab.org/ftp/pub/narval/
+MASTER_SITES=	${MASTER_SITE_LOGILAB}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Network Assistant Reasoning with a Validating Agent Language
--- devel/py-logilab-common/Makefile.orig	2009-07-04 19:53:49.000000000 +0200
+++ devel/py-logilab-common/Makefile	2009-08-12 17:53:44.000000000 +0200
@@ -8,9 +8,8 @@
 PORTNAME=	logilab-common
 PORTVERSION=	0.42.0
 CATEGORIES=	devel python
-MASTER_SITES=	ftp://ftp.logilab.fr/pub/common/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dryice
+MASTER_SITES=	${MASTER_SITE_LOGILAB}
+MASTER_SITE_SUBDIR=	${PORTNAME:C/logilab-//}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	mva@FreeBSD.org
--- devel/hgview/Makefile.orig	2009-06-17 19:20:43.000000000 +0200
+++ devel/hgview/Makefile	2009-08-12 17:51:29.000000000 +0200
@@ -8,7 +8,8 @@
 PORTNAME=	hgview
 PORTVERSION=	1.0.1
 CATEGORIES=	devel
-MASTER_SITES=	http://ftp.logilab.org/pub/hgview/
+MASTER_SITES=	${MASTER_SITE_LOGILAB}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	A fast Mercurial log navigator written in pyqt4
--- devel/py-reverse/Makefile.orig	2007-07-30 11:41:20.000000000 +0200
+++ devel/py-reverse/Makefile	2009-08-12 17:54:32.000000000 +0200
@@ -9,7 +9,8 @@
 PORTNAME=	reverse
 PORTVERSION=	0.5.2
 CATEGORIES=	devel python
-MASTER_SITES=	ftp://ftp.logilab.org/pub/pyreverse/
+MASTER_SITES=	${MASTER_SITE_LOGILAB}
+MASTER_SITE_SUBDIR=	py${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
--- devel/py-astng/Makefile.orig	2009-08-11 11:34:33.000000000 +0200
+++ devel/py-astng/Makefile	2009-08-12 17:59:09.000000000 +0200
@@ -8,7 +8,8 @@
 PORTNAME=	astng
 PORTVERSION=	0.19.0
 CATEGORIES=	devel python
-MASTER_SITES=	ftp://ftp.logilab.org/pub/${PORTNAME}/
+MASTER_SITES=	${MASTER_SITE_LOGILAB}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	logilab-${PORTNAME}-${PORTVERSION}
 
--- devel/pylint/Makefile.orig	2009-03-26 11:11:36.000000000 +0100
+++ devel/pylint/Makefile	2009-08-12 17:55:33.000000000 +0200
@@ -8,8 +8,8 @@
 PORTNAME=	pylint
 PORTVERSION=	0.18.0
 CATEGORIES=	devel python
-MASTER_SITES=	ftp://ftp.logilab.org/pub/pylint/	\
-		http://ftp.logilab.org/pub/pylint/
+MASTER_SITES=	${MASTER_SITE_LOGILAB}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
 
 MAINTAINER=	mva@FreeBSD.org
--- textproc/py-xmltools/Makefile.orig	2009-08-02 11:17:54.000000000 +0200
+++ textproc/py-xmltools/Makefile	2009-08-12 17:56:29.000000000 +0200
@@ -10,7 +10,8 @@
 PORTVERSION=	1.4.0
 PORTREVISION=	4
 CATEGORIES=	textproc python
-MASTER_SITES=	ftp://ftp.logilab.org/pub/xmltools/
+MASTER_SITES=	${MASTER_SITE_LOGILAB}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org