From root@marcus.grupos.com.br  Mon Sep 25 21:10:21 2006
Return-Path: <root@marcus.grupos.com.br>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6AD5C16A49E
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 25 Sep 2006 21:10:21 +0000 (UTC)
	(envelope-from root@marcus.grupos.com.br)
Received: from corp.grupos.com.br (corp.grupos.com.br [200.193.29.43])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BC00E43D5F
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 25 Sep 2006 21:10:13 +0000 (GMT)
	(envelope-from root@marcus.grupos.com.br)
Received: from marcus.grupos.com.br (marcus.grupos.com.br [192.168.10.10])
	by corp.grupos.com.br (Postfix) with ESMTP id 6BE0B5CC0
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 25 Sep 2006 18:10:12 -0300 (BRT)
Received: by marcus.grupos.com.br (Postfix, from userid 0)
	id 484362844A; Mon, 25 Sep 2006 18:10:12 -0300 (BRT)
Message-Id: <20060925211012.484362844A@marcus.grupos.com.br>
Date: Mon, 25 Sep 2006 18:10:12 -0300 (BRT)
From: Marcus Alves Grando <mnag@FreeBSD.org>
Reply-To: Marcus Alves Grando <mnag@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port: net/dante and net/socks5 add CONFLICTS
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         103649
>Category:       ports
>Synopsis:       Update port: net/dante and net/socks5 add CONFLICTS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    anders
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 25 21:20:12 GMT 2006
>Closed-Date:    Tue Oct 31 13:43:06 GMT 2006
>Last-Modified:  Tue Oct 31 13:50:18 GMT 2006
>Originator:     Marcus Alves Grando
>Release:        FreeBSD 6.2-PRERELEASE i386
>Organization:
Grupos Internet S/A
>Environment:
System: FreeBSD marcus.grupos.com.br 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Sat Sep 23 18:44:00 BRT 2006 root@marcus.grupos.com.br:/usr/obj/usr/src/sys/MARCUS i386


	
>Description:

- Add CONFLICTS because include/socks.h are included in both.


	
>How-To-Repeat:
	
>Fix:

	

--- dante-socks5.patch begins here ---
Index: dante/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/dante/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- dante/Makefile	14 Feb 2006 21:18:16 -0000	1.25
+++ dante/Makefile	25 Sep 2006 21:07:43 -0000
@@ -15,6 +15,8 @@
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	A circuit-level firewall/proxy
 
+CONFLICTS=	socks5-[0-9]*
+
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-socks-conf=${PREFIX}/etc/socks.conf \
Index: socks5/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/socks5/Makefile,v
retrieving revision 1.46
diff -u -r1.46 Makefile
--- socks5/Makefile	16 Jun 2005 19:36:12 -0000	1.46
+++ socks5/Makefile	25 Sep 2006 21:07:43 -0000
@@ -18,6 +18,8 @@
 NO_CDROM=	"NEC has a funky license for this software"
 RESTRICTED=	"no commercial use"
 
+CONFLICTS=	dante-[0-9]*
+
 # here are some extra configure args you may wish to use
 # see the readme file before screwing with them
 #
--- dante-socks5.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->anders 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Sep 25 21:20:24 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103649 
State-Changed-From-To: open->closed 
State-Changed-By: mnag 
State-Changed-When: Tue Oct 31 13:43:04 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/103649: commit references a PR
Date: Tue, 31 Oct 2006 13:40:59 +0000 (UTC)

 mnag        2006-10-31 13:40:43 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/dante            Makefile 
     net/socks5           Makefile 
   Log:
   - Add CONFLICTS because include/socks.h are included in net/dante and net/socks5 too.
   
   PR:             103649
   Approved by:    maintainer timeout (35 days)
   
   Revision  Changes    Path
   1.26      +2 -0      ports/net/dante/Makefile
   1.47      +2 -0      ports/net/socks5/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:
