From owner-cvs-all@FreeBSD.ORG  Sat Jun 19 18:56:51 2010
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 90246106564A;
	Sat, 19 Jun 2010 18:56:51 +0000 (UTC)
	(envelope-from sylvio@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 671F68FC12;
	Sat, 19 Jun 2010 18:56:51 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5JIup55067235;
	Sat, 19 Jun 2010 18:56:51 GMT
	(envelope-from sylvio@repoman.freebsd.org)
Received: (from sylvio@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5JIupL0067234;
	Sat, 19 Jun 2010 18:56:51 GMT (envelope-from sylvio)
Message-Id: <201006191856.o5JIupL0067234@repoman.freebsd.org>
From: Sylvio Cesar Teixeira <sylvio@FreeBSD.org>
Date: Sat, 19 Jun 2010 18:56:51 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/archivers/rpm Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the entire tree
	<cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Jun 2010 18:56:51 -0000

sylvio      2010-06-19 18:56:51 UTC

  FreeBSD ports repository

  Modified files:
    archivers/rpm        Makefile 
  Log:
  - Update MASTER_SITES and merge CONFLICTS
  
  PR:             ports/147883
  Submitted by:   Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
  Feature safe:   yes
  
  Revision  Changes    Path
  1.70      +3 -2      ports/archivers/rpm/Makefile