svn commit: r306262 - in head: Mk net/samba34 net/samba35

[Timur I. Bakeyev]

Author: timur
Date: Mon Oct 22 09:17:51 2012
New Revision: 306262
URL: http://svn.freebsd.org/changeset/ports/306262

Log:
  Adjust samba sites so that they can be used by other ports that fetch from the same origin.
  
  Feature safe:	yes

Modified:
  head/Mk/bsd.sites.mk
  head/net/samba34/Makefile
  head/net/samba35/Makefile

Modified: head/Mk/bsd.sites.mk
==============================================================================
--- head/Mk/bsd.sites.mk	Mon Oct 22 09:07:43 2012	(r306261)
+++ head/Mk/bsd.sites.mk	Mon Oct 22 09:17:51 2012	(r306262)
@@ -1165,10 +1165,10 @@ MASTER_SITE_RUBYGEMS+= \
 
 .if !defined(IGNORE_MASTER_SITE_SAMBA)
 MASTER_SITE_SAMBA+= \
-	http://ftp.samba.org/pub/samba/%SUBDIR%/ \
-	ftp://ca.samba.org/pub/samba/%SUBDIR%/ \
-	ftp://de.samba.org/pub/samba/%SUBDIR%/ \
-	ftp://ftp.easynet.be/samba/%SUBDIR%/ \
+	http://ftp.samba.org/pub/%SUBDIR%/ \
+	ftp://ca.samba.org/pub/%SUBDIR%/ \
+	ftp://de.samba.org/pub/%SUBDIR%/ \
+	ftp://ftp.easynet.be/%SUBDIR%/ \
 	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/samba/&,}
 .endif
 

Modified: head/net/samba34/Makefile
==============================================================================
--- head/net/samba34/Makefile	Mon Oct 22 09:07:43 2012	(r306261)
+++ head/net/samba34/Makefile	Mon Oct 22 09:17:51 2012	(r306262)
@@ -10,7 +10,7 @@ PORTVERSION=		3.4.17
 PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR=	. old-versions rc pre
+MASTER_SITE_SUBDIR=	samba samba/old-versions samba/rc samba/pre
 DISTNAME=		${PORTNAME:S|34$||}-${PORTVERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 MAINTAINER?=		timur at FreeBSD.org

Modified: head/net/samba35/Makefile
==============================================================================
--- head/net/samba35/Makefile	Mon Oct 22 09:07:43 2012	(r306261)
+++ head/net/samba35/Makefile	Mon Oct 22 09:17:51 2012	(r306262)
@@ -10,7 +10,7 @@ PORTVERSION=		3.5.15
 PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR=	. old-versions rc pre
+MASTER_SITE_SUBDIR=	samba samba/old-versions samba/rc samba/pre
 DISTNAME=		${SAMBA_BASENAME}-${PORTVERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 MAINTAINER?=		timur at FreeBSD.org