From fuyuki@nigredo.org  Sat Mar  6 15:25:03 2004
Return-Path: <fuyuki@nigredo.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E162616A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  6 Mar 2004 15:25:03 -0800 (PST)
Received: from mgate15.so-net.ne.jp (mgate15.so-net.ne.jp [210.139.254.162])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0FD9543D1D
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  6 Mar 2004 15:25:03 -0800 (PST)
	(envelope-from fuyuki@nigredo.org)
Received: from mail.dg8.so-net.ne.jp (mspool12.so-net.ne.jp [210.139.248.12])
	by mgate15.so-net.ne.jp  with ESMTP id i26NP1913411
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 7 Mar 2004 08:25:02 +0900 (JST)
Received: from ns.nigredo.org (pdd2f34.spprac00.ap.so-net.ne.jp [218.221.47.52])
	by mail.dg8.so-net.ne.jp  with ESMTP id i26NP1i01516
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 7 Mar 2004 08:25:01 +0900 (JST)
Message-Id: <86ad2tk182.wl%fuyuki@nigredo.org>
Date: Sun, 07 Mar 2004 08:25:01 +0900
From: Kimura Fuyuki <fuyuki@nigredo.org>
To: FreeBSD-gnats-submit@freebsd.org
Subject: bsd.sites.mk: Add MASTER_SITE_SAMBA

>Number:         63861
>Category:       ports
>Synopsis:       bsd.sites.mk: Add MASTER_SITE_SAMBA
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    osa
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 06 15:30:08 PST 2004
>Closed-Date:    Thu Mar 11 02:23:26 PST 2004
>Last-Modified:  Thu Mar 11 02:23:26 PST 2004
>Originator:     Kimura Fuyuki
>Release:        FreeBSD 5.2.1-RELEASE-p1 i386
>Organization:
>Environment:

  FreeBSD ns.nigredo.org 5.2.1-RELEASE-p1 i386

>Description:

Add MASTER_SITE_SAMBA. It can be used by only four ports but they are
very popular and their distfiles are huge.

The mirror list is based on samba-devel/Makefile and I tweaked it a
bit using the information from http://www.samba.org/.

>How-To-Repeat:

>Fix:
Index: bsd.sites.mk
===================================================================
RCS file: /cvs/FreeBSD/ports/Mk/bsd.sites.mk,v
retrieving revision 1.224
diff -u -r1.224 bsd.sites.mk
--- bsd.sites.mk	6 Mar 2004 16:28:30 -0000	1.224
+++ bsd.sites.mk	6 Mar 2004 23:06:34 -0000
@@ -723,6 +728,24 @@
 	http://mirrors.sunsite.dk/ruby/%SUBDIR%/ \
 	ftp://ftp.iDaemons.org/pub/mirror/ftp.ruby-lang.org/ruby/%SUBDIR%/
 
+MASTER_SITE_SAMBA+= \
+	http://us3.samba.org/samba/ftp/%SUBDIR%/ \
+	http://us1.samba.org/samba/ftp/%SUBDIR%/ \
+	http://us4.samba.org/samba/ftp/%SUBDIR%/ \
+	http://us2.samba.org/samba/ftp/%SUBDIR%/ \
+	ftp://ca.samba.org/%SUBDIR%/ \
+	ftp://de.samba.org/samba.org/%SUBDIR%/ \
+	ftp://ftp.k2.net/mirrors/samba/%SUBDIR%/ \
+	ftp://ftp.oss.eznetsols.org/samba/%SUBDIR%/ \
+	ftp://gd.tuwien.ac.at/infosys/servers/samba/%SUBDIR%/ \
+	ftp://giswitch.sggw.waw.pl/pub/unix/samba/%SUBDIR%/ \
+	ftp://ru.samba.org/pub/samba/%SUBDIR%/ \
+	ftp://tr.samba.org/samba/%SUBDIR%/ \
+	http://sambafr.idealx.org/samba/ftp/%SUBDIR%/ \
+	ftp://ftp.easynet.be/samba/ftp/%SUBDIR%/ \
+	ftp://ftp.linuxforum.net/ftp.samba.org/%SUBDIR%/ \
+	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/samba/&,} \
+
 MASTER_SITE_SAVANNAH+= \
 	http://savannah.nongnu.org/download/%SUBDIR%/ \
 	ftp://ftp.gnu.org/pub/savannah/files/%SUBDIR%/

Index: Makefile
===================================================================
RCS file: /cvs/FreeBSD/ports/net/samba/Makefile,v
retrieving revision 1.132
diff -u -r1.132 Makefile
--- Makefile	4 Mar 2004 08:09:58 -0000	1.132
+++ Makefile	6 Mar 2004 22:57:23 -0000
@@ -9,9 +9,7 @@
 PORTVERSION=	2.2.8a
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	http://us3.samba.org/samba/ftp/%SUBDIR%/ \
-		http://us4.samba.org/samba/ftp/%SUBDIR%/ \
-		http://us5.samba.org/samba/ftp/%SUBDIR%/
+MASTER_SITES=	${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	. old-versions
 
 .if defined(WITH_JAIL)
Index: Makefile
===================================================================
RCS file: /cvs/FreeBSD/ports/net/samba-devel/Makefile,v
retrieving revision 1.105
diff -u -r1.105 Makefile
--- Makefile	5 Mar 2004 14:25:42 -0000	1.105
+++ Makefile	6 Mar 2004 22:58:55 -0000
@@ -10,18 +10,7 @@
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	http://us1.samba.org/samba/ftp/%SUBDIR%/ \
-		http://us3.samba.org/samba/ftp/%SUBDIR%/ \
-		http://us4.samba.org/samba/ftp/%SUBDIR%/ \
-		ftp://ca.samba.org/%SUBDIR%/ \
-		ftp://de.samba.org/samba.org/%SUBDIR%/ \
-		ftp://ftp.k2.net/mirrors/samba/%SUBDIR%/ \
-		ftp://ftp.oss.eznetsols.org/samba/%SUBDIR%/ \
-		ftp://gd.tuwien.ac.at/infosys/servers/samba/%SUBDIR%/ \
-		ftp://giswitch.sggw.waw.pl/pub/unix/samba/%SUBDIR%/ \
-		ftp://ru.samba.org/pub/samba/%SUBDIR%/ \
-		ftp://tr.samba.org/samba/%SUBDIR%/ \
-		http://sambafr.idealx.org/samba/ftp/%SUBDIR%/
+MASTER_SITES=	${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	. rc
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/:S/.a/a/}
 
Index: Makefile
===================================================================
RCS file: /cvs/FreeBSD/ports/net/samba-libsmbclient/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile	6 Mar 2004 11:41:58 -0000	1.11
+++ Makefile	6 Mar 2004 22:59:41 -0000
@@ -8,19 +8,7 @@
 PORTNAME=	samba
 PORTVERSION=	3.0.2a
 CATEGORIES=	net
-MASTER_SITES=	http://us3.samba.org/samba/ftp/%SUBDIR%/ \
-		http://us1.samba.org/samba/ftp/%SUBDIR%/ \
-		http://us4.samba.org/samba/ftp/%SUBDIR%/ \
-		http://us5.samba.org/samba/ftp/%SUBDIR%/ \
-		ftp://ca.samba.org/%SUBDIR%/ \
-		ftp://de.samba.org/samba.org/%SUBDIR%/ \
-		ftp://ftp.k2.net/mirrors/samba/%SUBDIR%/ \
-		ftp://ftp.oss.eznetsols.org/samba/%SUBDIR%/ \
-		ftp://gd.tuwien.ac.at/infosys/servers/samba/%SUBDIR%/ \
-		ftp://giswitch.sggw.waw.pl/pub/unix/samba/%SUBDIR%/ \
-		ftp://ru.samba.org/pub/samba/%SUBDIR%/ \
-		ftp://tr.samba.org/samba/%SUBDIR%/ \
-		http://sambafr.idealx.org/samba/ftp/%SUBDIR%/
+MASTER_SITES=	${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	. old-versions
 PKGNAMESUFFIX=	-libsmbclient
 
Index: Makefile
===================================================================
RCS file: /cvs/FreeBSD/ports/www/smb2www/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile	4 Feb 2004 05:09:35 -0000	1.6
+++ Makefile	6 Mar 2004 23:05:12 -0000
@@ -9,12 +9,8 @@
 PORTVERSION=	0.0.980804
 PORTREVISION=	2
 CATEGORIES=	www
-MASTER_SITES=	http://us1.samba.org/samba/smb2www/ \
-		http://us2.samba.org/samba/smb2www/ \
-		http://us3.samba.org/samba/smb2www/ \
-		http://us4.samba.org/samba/smb2www/ \
-		http://uk.samba.org/samba/smb2www/ \
-		http://sunsite.auc.dk/samba/smb2www/
+MASTER_SITES=	${MASTER_SITE_SAMBA}
+MASTER_SITE_SUBDIR=	smb2www
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/0.0.//g}
 
 MAINTAINER=	roman@xpert.com
>Release-Note:
>Audit-Trail:

From: Kimura Fuyuki <fuyuki@nigredo.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/63861: bsd.sites.mk: Add MASTER_SITE_SAMBA
Date: Sun, 07 Mar 2004 08:36:28 +0900

 I found another port that could utilize MASTER_SITE_SAMBA.
 
 cvs diff: Diffing .
 Index: Makefile
 ===================================================================
 RCS file: /cvs/FreeBSD/ports/security/pam_smb/Makefile,v
 retrieving revision 1.19
 diff -u -r1.19 Makefile
 --- Makefile	4 Feb 2004 05:08:50 -0000	1.19
 +++ Makefile	6 Mar 2004 23:31:39 -0000
 @@ -5,11 +5,12 @@
  # $FreeBSD: ports/security/pam_smb/Makefile,v 1.19 2004/02/04 05:08:50 marcus Exp $
  
  PORTNAME=	pam_smb
 -PORTVERSION=	2.0.0.r5
 -PORTREVISION=	3
 +PORTVERSION=	2.0.0.r6
  CATEGORIES=	security
  MASTER_SITES=	http://pamsmb.sourceforge.net/v2/ \
 -		http://www.csn.ul.ie/~airlied/pam_smb/v2/
 +		http://www.csn.ul.ie/~airlied/pam_smb/v2/ \
 +		${MASTER_SITE_SAMBA}
 +MASTER_SITE_SUBDIR=	pam_smb/v2
  DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-rc/}
  
  MAINTAINER=	ports@FreeBSD.org
 Index: distinfo
 ===================================================================
 RCS file: /cvs/FreeBSD/ports/security/pam_smb/distinfo,v
 retrieving revision 1.4
 diff -u -r1.4 distinfo
 --- distinfo	29 Jan 2004 16:11:36 -0000	1.4
 +++ distinfo	6 Mar 2004 23:31:48 -0000
 @@ -1,2 +1,2 @@
 -MD5 (pam_smb-2.0.0-rc5.tar.gz) = 48cd4986cdf2cc36f668fe177d932d9f
 -SIZE (pam_smb-2.0.0-rc5.tar.gz) = 114456
 +MD5 (pam_smb-2.0.0-rc6.tar.gz) = 69e5473d01169296412dca4238c49566
 +SIZE (pam_smb-2.0.0-rc6.tar.gz) = 115069
 cvs diff: Diffing files
Responsible-Changed-From-To: freebsd-ports-bugs->osa 
Responsible-Changed-By: osa 
Responsible-Changed-When: Thu Mar 11 00:58:47 PST 2004 
Responsible-Changed-Why:  
I'll handle this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=63861 
State-Changed-From-To: open->closed 
State-Changed-By: osa 
State-Changed-When: Thu Mar 11 02:23:01 PST 2004 
State-Changed-Why:  
Committed with little modifications! 
Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=63861 
>Unformatted:
