diff options
| author | mnag <mnag@FreeBSD.org> | 2006-10-31 21:40:43 +0800 |
|---|---|---|
| committer | mnag <mnag@FreeBSD.org> | 2006-10-31 21:40:43 +0800 |
| commit | c2a9549306d5a650a92148047918b6b68ddcbe1f (patch) | |
| tree | fa891598c7c7f64fdf9f2b94cda5a6133a218b74 /net | |
| parent | 942580768fdefbb658f2aa5d05fc05da74055556 (diff) | |
| download | freebsd-ports-gnome-c2a9549306d5a650a92148047918b6b68ddcbe1f.tar.gz freebsd-ports-gnome-c2a9549306d5a650a92148047918b6b68ddcbe1f.tar.zst freebsd-ports-gnome-c2a9549306d5a650a92148047918b6b68ddcbe1f.zip | |
- Add CONFLICTS because include/socks.h are included in net/dante and net/socks5 too.
PR: 103649
Approved by: maintainer timeout (35 days)
Diffstat (limited to 'net')
| -rw-r--r-- | net/dante/Makefile | 2 | ||||
| -rw-r--r-- | net/socks5/Makefile | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/net/dante/Makefile b/net/dante/Makefile index cf66c0d9c586..cfe10d07a0b6 100644 --- a/net/dante/Makefile +++ b/net/dante/Makefile @@ -15,6 +15,8 @@ MASTER_SITES= ftp://ftp.inet.no/pub/socks/ \ 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 \ diff --git a/net/socks5/Makefile b/net/socks5/Makefile index 21cb84dc2d5c..8b53d99b4d0f 100644 --- a/net/socks5/Makefile +++ b/net/socks5/Makefile @@ -18,6 +18,8 @@ COMMENT= SOCKS v5 application layer gateway and clients 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 # |