Date: Mon, 25 Sep 2006 18:10:12 -0300 (BRT) From: Marcus Alves Grando <mnag@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/103649: Update port: net/dante and net/socks5 add CONFLICTS Message-ID: <20060925211012.484362844A@marcus.grupos.com.br> Resent-Message-ID: <200609252120.k8PLKCVq053916@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060925211012.484362844A>