From cherry@spica.trombik.org  Wed Sep 26 05:38:23 2007
Return-Path: <cherry@spica.trombik.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B989516A469
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 26 Sep 2007 05:38:23 +0000 (UTC)
	(envelope-from cherry@spica.trombik.org)
Received: from spica.trombik.org (spica.trombik.org [211.19.48.12])
	by mx1.freebsd.org (Postfix) with ESMTP id 8DE3213C461
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 26 Sep 2007 05:38:23 +0000 (UTC)
	(envelope-from cherry@spica.trombik.org)
Received: by spica.trombik.org (Postfix, from userid 999)
	id B4D1E3C043B; Wed, 26 Sep 2007 14:42:55 +0900 (JST)
Message-Id: <20070926054255.B4D1E3C043B@spica.trombik.org>
Date: Wed, 26 Sep 2007 14:42:55 +0900 (JST)
From: Tomoyuki Sakurai <cherry@trombik.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] sysutils/puppet: add CONFLICTS with puppet-devel
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         116650
>Category:       ports
>Synopsis:       [MAINTAINER] sysutils/puppet: add CONFLICTS with puppet-devel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 26 05:40:02 GMT 2007
>Closed-Date:    Thu Sep 27 21:42:20 GMT 2007
>Last-Modified:  Thu Sep 27 21:50:01 GMT 2007
>Originator:     Tomoyuki Sakurai
>Release:        FreeBSD 6.2-STABLE-200706 i386
>Organization:
>Environment:
System: FreeBSD spica.trombik.org 6.2-STABLE-200706 FreeBSD 6.2-STABLE-200706 #0: Sun Jun  3 13:54:03 UTC
>Description:
since puppet-devel in the tree, register CONFLICTS with puppet-devel.

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

--- puppet-0.22.4_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/puppet/Makefile /usr/home/cherry/svn/ports/sysutils/puppet/Makefile
--- /usr/ports/sysutils/puppet/Makefile	Sun May 27 20:31:25 2007
+++ /usr/home/cherry/svn/ports/sysutils/puppet/Makefile	Wed Sep 26 14:37:50 2007
@@ -7,6 +7,7 @@
 
 PORTNAME=	puppet
 PORTVERSION=	0.22.4
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.reductivelabs.com/downloads/puppet/
 EXTRACT_SUFX=	.tgz
@@ -17,6 +18,7 @@
 BUILD_DEPENDS=	${RUBY_SITELIBDIR}/facter.rb:${PORTSDIR}/sysutils/facter
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+CONFLICTS=	puppet-devel-[0-9]*
 NO_BUILD=	yes
 USE_RUBY=	yes
 USE_RC_SUBR=	puppetmasterd puppetd
--- puppet-0.22.4_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Wed Sep 26 07:27:41 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=116650 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Thu Sep 27 21:42:15 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=116650 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/116650: commit references a PR
Date: Thu, 27 Sep 2007 21:42:08 +0000 (UTC)

 miwi        2007-09-27 21:42:02 UTC
 
   FreeBSD ports repository
 
   Modified files:
     sysutils/puppet      Makefile 
   Log:
   - add CONFLICTS with puppet-devel
   
   PR:             116650
   Submitted by:   Tomoyuki Sakurai <cherry@trombik.org> (maintainer)
   
   Revision  Changes    Path
   1.5       +1 -0      ports/sysutils/puppet/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
