ports/147883: [PATCH] archivers/rpm: update MASTER_SITES and merge CONFLICTS

[Sunpoet Po-Chuan Hsieh]

>Number:         147883
>Category:       ports
>Synopsis:       [PATCH] archivers/rpm: update MASTER_SITES and merge CONFLICTS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 15 16:40:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 8.1-PRERELEASE amd64
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #0: Wed May 19 00:13:00 CST 2010
>Description:
Update MASTER_SITES and merge CONFLICTS.

Port maintainer (sylvio at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- rpm-3.0.6_15.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/archivers/rpm/Makefile /usr/ports/sunpoet/rpm/Makefile
--- /usr/ports/archivers/rpm/Makefile	2010-05-31 10:56:17.000000000 +0800
+++ /usr/ports/sunpoet/rpm/Makefile	2010-06-16 00:32:53.000000000 +0800
@@ -10,14 +10,15 @@
 PORTREVISION=	15
 CATEGORIES=	archivers
 MASTER_SITES=	http://rpm5.org/files/rpm/rpm-3.0/ \
-		http://ftp.tpnet.pl/vol/d4/ftp.rpm.org/rpm/dist/rpm-3.0.x/
+		http://rpm.org/releases/historical/rpm-3.0.x/ \
+		http://www.mirrorservice.org/sites/ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/
 
 MAINTAINER=	sylvio at FreeBSD.org
 COMMENT=	The Red Hat Package Manager
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
-CONFLICTS=	rpm-4.* rpm-5.*
+CONFLICTS=	rpm-[45].*
 
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
--- rpm-3.0.6_15.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: