diff options
| author | wiz <wiz@pkgsrc.org> | 2016-12-01 14:48:02 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2016-12-01 14:48:02 +0000 |
| commit | 612c03ab6533bcf8f197d23f8fa511f82c4dafaa (patch) | |
| tree | 7a4b0de3e4822aa358069ea2323b797bde932d44 /net | |
| parent | 57ab5c286c30f161dac7fd882e8ab70bdd442a48 (diff) | |
| download | pkgsrc-612c03ab6533bcf8f197d23f8fa511f82c4dafaa.tar.gz | |
Fix weird CONFLICTS line.
Diffstat (limited to 'net')
| -rw-r--r-- | net/irrtoolset5/Makefile | 5 | ||||
| -rw-r--r-- | net/isc-dhcp4/Makefile.common | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/net/irrtoolset5/Makefile b/net/irrtoolset5/Makefile index dd9fc6737e3..1e55d06f19c 100644 --- a/net/irrtoolset5/Makefile +++ b/net/irrtoolset5/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/07/15 02:02:27 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.9 2016/12/01 14:48:02 wiz Exp $ VERSION= 5.0.1 DISTNAME= irrtoolset-${VERSION} @@ -11,7 +10,7 @@ HOMEPAGE= http://irrtoolset.isc.org/ COMMENT= The Internet Routing Registry Toolset - client to IRRd LICENSE= gnu-gpl-v2 AND mit AND modified-bsd -CONFLICTS= IRRToolSet-4.*{,nb*} +CONFLICTS= IRRToolSet-4.* .include "../../mk/bsd.prefs.mk" diff --git a/net/isc-dhcp4/Makefile.common b/net/isc-dhcp4/Makefile.common index 84c57e16fdb..06e93998d64 100644 --- a/net/isc-dhcp4/Makefile.common +++ b/net/isc-dhcp4/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.31 2016/03/30 15:55:44 taca Exp $ +# $NetBSD: Makefile.common,v 1.32 2016/12/01 14:48:02 wiz Exp $ # # used by net/isc-dhcp4/Makefile # used by net/isc-dhcpd4/Makefile @@ -15,7 +15,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://www.isc.org/sw/dhcp LICENSE= isc -CONFLICTS+= isc-dhcp-base-3.*{,nb*} +CONFLICTS+= isc-dhcp-base-3.* VERSION= 4.3.4 |