From owner-cvs-all@FreeBSD.ORG  Sun May 22 17:09:50 2011
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 E2AB21065674;
	Sun, 22 May 2011 17:09:50 +0000 (UTC) (envelope-from flo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BC48C8FC1F;
	Sun, 22 May 2011 17:09:50 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p4MH9oeO038216;
	Sun, 22 May 2011 17:09:50 GMT (envelope-from flo@repoman.freebsd.org)
Received: (from flo@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p4MH9ox3038215;
	Sun, 22 May 2011 17:09:50 GMT (envelope-from flo)
Message-Id: <201105221709.p4MH9ox3038215@repoman.freebsd.org>
From: Florian Smeets <flo@FreeBSD.org>
Date: Sun, 22 May 2011 17:09:50 +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/net/asterisk Makefile pkg-plist
 ports/net/asterisk/files patch-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: Sun, 22 May 2011 17:09:51 -0000

flo         2011-05-22 17:09:50 UTC

  FreeBSD ports repository

  Modified files:
    net/asterisk         Makefile pkg-plist 
    net/asterisk/files   patch-Makefile 
  Log:
  - prevent deletion of asterisk.conf, it was mistakenly added to pkg-plist
  - make sure asterisk.conf and asterisk.conf-dist are identicall on install
  
  PR:             ports/156775, ports/156992
  
  Revision  Changes    Path
  1.154     +1 -0      ports/net/asterisk/Makefile
  1.27      +13 -8     ports/net/asterisk/files/patch-Makefile
  1.49      +0 -1      ports/net/asterisk/pkg-plist