From prvs=0998bca5ce=root@cainites.net  Tue Apr 22 08:50:38 2008
Return-Path: <prvs=0998bca5ce=root@cainites.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C0EA41065675
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 22 Apr 2008 08:50:38 +0000 (UTC)
	(envelope-from prvs=0998bca5ce=root@cainites.net)
Received: from cainites.net (tunnel3563.ipv6.xs4all.nl [IPv6:2001:888:10:deb::2])
	by mx1.freebsd.org (Postfix) with ESMTP id 6AF5B8FC1B
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 22 Apr 2008 08:50:37 +0000 (UTC)
	(envelope-from prvs=0998bca5ce=root@cainites.net)
Received: from root by cainites.net with local (Exim 4.69 (FreeBSD))
	(envelope-from <root@cainites.net>)
	id 1JoE9g-0009vg-IQ; Tue, 22 Apr 2008 10:47:12 +0200
Message-Id: <E1JoE9g-0009vg-IQ@cainites.net>
Date: Tue, 22 Apr 2008 10:47:12 +0200
From: Ralf van der Enden <tremere@cainites.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: tremere@cainites.net
Subject: [PATCH] dns/powerdns: Add CONFLICTS for dns/powerdns-devel
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         122982
>Category:       ports
>Synopsis:       [PATCH] dns/powerdns: Add CONFLICTS for dns/powerdns-devel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jadawin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 22 09:00:00 UTC 2008
>Closed-Date:    Wed May 07 13:32:29 UTC 2008
>Last-Modified:  Wed May 07 13:32:29 UTC 2008
>Originator:     Ralf van der Enden
>Release:        FreeBSD 7.0-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD lan.cainites.net 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #1: Thu Apr 17 10:42:59 CEST 2008
>Description:
Add CONFLICTS for dns/powerdns-devel

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

--- powerdns-2.9.21.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/dns/powerdns/Makefile /usr/ports/dns/powerdns.new/Makefile
--- /usr/ports/dns/powerdns/Makefile	2007-07-23 11:35:47.000000000 +0200
+++ /usr/ports/dns/powerdns.new/Makefile	2008-04-22 10:27:21.000000000 +0200
@@ -17,6 +17,8 @@
 
 BUILD_DEPENDS=	bjam:${PORTSDIR}/devel/boost
 
+CONFLICTS=	powerdns-devel-[0-9]*
+
 USE_GMAKE=	YES
 USE_SUBMAKE=	YES
 USE_AUTOTOOLS=	libtool:15
diff -ruN --exclude=CVS /usr/ports/dns/powerdns/pkg-plist /usr/ports/dns/powerdns.new/pkg-plist
--- /usr/ports/dns/powerdns/pkg-plist	2007-04-27 09:25:39.000000000 +0200
+++ /usr/ports/dns/powerdns.new/pkg-plist	2008-04-22 10:29:35.000000000 +0200
@@ -37,10 +37,10 @@
 @unexec if cmp -s %D/etc/pdns/pdns.conf %D/etc/pdns/pdns.conf-dist; then rm -f %D/etc/pdns/pdns.conf; fi
 etc/pdns/pdns.conf-dist
 @exec [ -f %B/pdns.conf ] || cp %B/%f %B/pdns.conf
-%%PORTDOCS%%share/examples/powerdns/pdns.conf
-%%PORTDOCS%%share/examples/powerdns/tables-mssql_or_sybase.sql
-%%PORTDOCS%%share/examples/powerdns/tables-mysql.sql
-%%PORTDOCS%%share/examples/powerdns/tables-pgsql.sql
-%%PORTDOCS%%share/examples/powerdns/tables-sqlite.sql
-%%PORTDOCS%%@dirrm share/examples/powerdns
+%%PORTDOCS%%%%EXAMPLESDIR%%/pdns.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/tables-mssql_or_sybase.sql
+%%PORTDOCS%%%%EXAMPLESDIR%%/tables-mysql.sql
+%%PORTDOCS%%%%EXAMPLESDIR%%/tables-pgsql.sql
+%%PORTDOCS%%%%EXAMPLESDIR%%/tables-sqlite.sql
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrmtry etc/pdns
--- powerdns-2.9.21.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jadawin 
Responsible-Changed-By: tabthorpe 
Responsible-Changed-When: Tue Apr 22 22:20:21 UTC 2008 
Responsible-Changed-Why:  
Over to jadawin. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/122982: commit references a PR
Date: Wed,  7 May 2008 12:45:33 +0000 (UTC)

 jadawin     2008-05-07 12:45:23 UTC
 
   FreeBSD ports repository
 
   Modified files:
     dns/powerdns         Makefile distinfo pkg-descr pkg-plist 
   Log:
   - Add CONFLICTS for dns/powerdns-devel
   
   PR:             ports/122982
   Submitted by:   Ralf van der Enden <tremere@cainites.net>
   Approved by:    thierry (mentor)
   
   Revision  Changes    Path
   1.60      +0 -0      ports/dns/powerdns/Makefile
   1.16      +0 -0      ports/dns/powerdns/distinfo
   1.2       +0 -0      ports/dns/powerdns/pkg-descr
   1.16      +0 -0      ports/dns/powerdns/pkg-plist
 _______________________________________________
 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"
 
State-Changed-From-To: open->closed 
State-Changed-By: jadawin 
State-Changed-When: Wed May 7 13:32:27 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=122982 
>Unformatted:
