From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Sep 25 21:20:13 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AB03C16A492 for ; Mon, 25 Sep 2006 21:20:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 173AF43D60 for ; Mon, 25 Sep 2006 21:20:13 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k8PLKCOF053917 for ; Mon, 25 Sep 2006 21:20:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k8PLKCVq053916; Mon, 25 Sep 2006 21:20:12 GMT (envelope-from gnats) Resent-Date: Mon, 25 Sep 2006 21:20:12 GMT Resent-Message-Id: <200609252120.k8PLKCVq053916@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Marcus Alves Grando Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6AD5C16A49E for ; 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 ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/103649: Update port: net/dante and net/socks5 add CONFLICTS X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Marcus Alves Grando List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Sep 2006 21:20:13 -0000 >Number: 103649 >Category: ports >Synopsis: Update port: net/dante and net/socks5 add CONFLICTS >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Sep 25 21:20:12 GMT 2006 >Closed-Date: >Last-Modified: >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: >Unformatted: