diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/exabgp4/Makefile | 2 | ||||
-rw-r--r-- | net/haproxy-devel/Makefile | 2 | ||||
-rw-r--r-- | net/haproxy/Makefile | 2 | ||||
-rw-r--r-- | net/haproxy17/Makefile | 2 | ||||
-rw-r--r-- | net/haproxy18/Makefile | 2 | ||||
-rw-r--r-- | net/haproxy19/Makefile | 2 | ||||
-rw-r--r-- | net/haproxy20/Makefile | 2 | ||||
-rw-r--r-- | net/haproxy21/Makefile | 2 | ||||
-rw-r--r-- | net/haproxy22/Makefile | 2 | ||||
-rw-r--r-- | net/haproxy23/Makefile | 2 | ||||
-rw-r--r-- | net/libexosip2/Makefile | 2 | ||||
-rw-r--r-- | net/p5-SOAP-Lite/Makefile | 2 | ||||
-rw-r--r-- | net/py-pysendfile/Makefile | 2 | ||||
-rw-r--r-- | net/tshark-lite/Makefile | 2 | ||||
-rw-r--r-- | net/tshark/Makefile | 2 | ||||
-rw-r--r-- | net/wireshark-lite/Makefile | 2 | ||||
-rw-r--r-- | net/wireshark/Makefile | 2 |
17 files changed, 17 insertions, 17 deletions
diff --git a/net/exabgp4/Makefile b/net/exabgp4/Makefile index 36062d447510..2f85179851a6 100644 --- a/net/exabgp4/Makefile +++ b/net/exabgp4/Makefile @@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/LICENCE.txt USES= python:3.6+ shebangfix USE_PYTHON= distutils autoplist -CONFLICTS_INSTALL= exabgp-[0-9]* +CONFLICTS_INSTALL= exabgp SUB_FILES= pkg-message SUB_LIST= PYTHON_LIBDIR=${PYTHON_LIBDIR} PYTHON_CMD=${PYTHON_CMD} \ diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile index 3154b678cc59..0843de3e7be9 100644 --- a/net/haproxy-devel/Makefile +++ b/net/haproxy-devel/Makefile @@ -13,7 +13,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -CONFLICTS_INSTALL= haproxy-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]* +CONFLICTS_INSTALL= haproxy haproxy17 haproxy18 haproxy19 haproxy20 haproxy21 USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 062716b8fc66..593da6e2dc9f 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -18,7 +18,7 @@ default_CONFLICTS_INSTALL= haproxy-lua lua_CONFLICTS_INSTALL= haproxy lua_PKGNAMESUFFIX= -lua -CONFLICTS_INSTALL= haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]* +CONFLICTS_INSTALL= haproxy-devel haproxy17 haproxy18 haproxy19 haproxy20 haproxy21 USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy17/Makefile b/net/haproxy17/Makefile index 044b96a7ffab..572b736fb8a9 100644 --- a/net/haproxy17/Makefile +++ b/net/haproxy17/Makefile @@ -15,7 +15,7 @@ LICENSE_COMB= multi BROKEN_mips= fails to build: undefined reference to '__sync_sub_and_fetch_4' BROKEN_mips64= fails to build: undefined reference to '__sync_sub_and_fetch_4' -CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]* +CONFLICTS_INSTALL= haproxy haproxy-devel haproxy18 haproxy19 haproxy20 haproxy21 USES= cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy18/Makefile b/net/haproxy18/Makefile index 5d444f001797..9ab3f2da746e 100644 --- a/net/haproxy18/Makefile +++ b/net/haproxy18/Makefile @@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]* +CONFLICTS_INSTALL= haproxy haproxy-devel haproxy17 haproxy19 haproxy20 haproxy21 USES= cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy19/Makefile b/net/haproxy19/Makefile index 67f22562acf6..9a4db6b9ad71 100644 --- a/net/haproxy19/Makefile +++ b/net/haproxy19/Makefile @@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]* +CONFLICTS_INSTALL= haproxy haproxy-devel haproxy17 haproxy18 haproxy20 haproxy21 USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy20/Makefile b/net/haproxy20/Makefile index 52d777683d83..b52296caabec 100644 --- a/net/haproxy20/Makefile +++ b/net/haproxy20/Makefile @@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy21-[0-9]* +CONFLICTS_INSTALL= haproxy haproxy-devel haproxy17 haproxy18 haproxy19 haproxy21 USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy21/Makefile b/net/haproxy21/Makefile index bd43f64d3a25..0715da768e55 100644 --- a/net/haproxy21/Makefile +++ b/net/haproxy21/Makefile @@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* +CONFLICTS_INSTALL= haproxy haproxy-devel haproxy17 haproxy18 haproxy19 haproxy20 USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy22/Makefile b/net/haproxy22/Makefile index 43b05a2f8bd6..b1141e2b6a79 100644 --- a/net/haproxy22/Makefile +++ b/net/haproxy22/Makefile @@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -CONFLICTS_INSTALL= haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]* +CONFLICTS_INSTALL= haproxy-devel haproxy17 haproxy18 haproxy19 haproxy20 haproxy21 USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy23/Makefile b/net/haproxy23/Makefile index 2015b15d59e7..63664f63ab7c 100644 --- a/net/haproxy23/Makefile +++ b/net/haproxy23/Makefile @@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -CONFLICTS_INSTALL= haproxy-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]* +CONFLICTS_INSTALL= haproxy haproxy17 haproxy18 haproxy19 haproxy20 haproxy21 USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy diff --git a/net/libexosip2/Makefile b/net/libexosip2/Makefile index a1b6e3f2a0f4..dc31add9783f 100644 --- a/net/libexosip2/Makefile +++ b/net/libexosip2/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libosip2.so:net/libosip2 USES= libtool ssl USE_LDCONFIG= yes -CONFLICTS_INSTALL= libeXosip2-legacy-[0-9]* +CONFLICTS_INSTALL= libeXosip2-legacy GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/net/p5-SOAP-Lite/Makefile b/net/p5-SOAP-Lite/Makefile index 86b13a385959..01caeb9dd749 100644 --- a/net/p5-SOAP-Lite/Makefile +++ b/net/p5-SOAP-Lite/Makefile @@ -28,7 +28,7 @@ TEST_DEPENDS= p5-Test-MockObject>=0:devel/p5-Test-MockObject \ p5-Test-Warn>=0:devel/p5-Test-Warn \ p5-Test-XML>=0:devel/p5-Test-XML -CONFLICTS_INSTALL= p5-SOAP-Lite-0.60* p5-SOAP-[0-9]* +CONFLICTS_INSTALL= p5-SOAP-Lite-0.60* p5-SOAP CONFIGURE_ARGS= --noprompt INSTALL_TARGET= pure_install diff --git a/net/py-pysendfile/Makefile b/net/py-pysendfile/Makefile index 0414902c7f53..846cbcccd6a5 100644 --- a/net/py-pysendfile/Makefile +++ b/net/py-pysendfile/Makefile @@ -13,7 +13,7 @@ COMMENT= Python interface to sendfile(2) LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS_INSTALL= py*-sendfile-[0-9]* +CONFLICTS_INSTALL= py*-sendfile USES= python:3.6+ USE_PYTHON= distutils autoplist diff --git a/net/tshark-lite/Makefile b/net/tshark-lite/Makefile index a67ad4d8ebe4..ad48443d9b68 100644 --- a/net/tshark-lite/Makefile +++ b/net/tshark-lite/Makefile @@ -2,7 +2,7 @@ LITE= yes -CONFLICTS_INSTALL?= tshark-[0-9]* wireshark-[0-9]* wireshark-lite-[0-9]* +CONFLICTS_INSTALL?= tshark wireshark wireshark-lite MASTERDIR= ${.CURDIR}/../tshark COMMENT= Powerful network analyzer/capture tool (lite package) diff --git a/net/tshark/Makefile b/net/tshark/Makefile index dfa8f2437aff..0d32e3be44b3 100644 --- a/net/tshark/Makefile +++ b/net/tshark/Makefile @@ -2,7 +2,7 @@ PORTNAME= tshark -CONFLICTS_INSTALL?= tshark-lite-[0-9]* wireshark-lite-[0-9]* wireshark-[0-9]* +CONFLICTS_INSTALL?= tshark-lite wireshark-lite wireshark MASTERDIR= ${.CURDIR}/../wireshark diff --git a/net/wireshark-lite/Makefile b/net/wireshark-lite/Makefile index 4d2f76d29b6a..65becb93b434 100644 --- a/net/wireshark-lite/Makefile +++ b/net/wireshark-lite/Makefile @@ -2,7 +2,7 @@ LITE= yes -CONFLICTS_INSTALL?= wireshark-[0-9]* tshark-[0-9]* tshark-lite-[0-9]* +CONFLICTS_INSTALL?= wireshark tshark tshark-lite MASTERDIR= ${.CURDIR}/../wireshark COMMENT= Powerful network analyzer/capture tool (lite package) diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 7afe05b110d1..9a78160ce281 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -20,7 +20,7 @@ COMMENT?= Powerful network analyzer/capture tool LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS_INSTALL?= wireshark-lite-[0-9]* tshark-[0-9]* tshark-lite-[0-9]* +CONFLICTS_INSTALL?= wireshark-lite tshark tshark-lite DATADIR_NAME= wireshark DATADIR= ${PREFIX}/share/${DATADIR_NAME} |