diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2011-07-10 03:24:46 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2011-07-10 03:24:46 +0000 |
| commit | c15c6962cd911a44361cc58275d5e88a886957c2 (patch) | |
| tree | efd73d725d5881c828fa6fee8b4e64bdf3a9ff0d /net/isc-dhcp41-server | |
| parent | 04e10aa1aada21b4298d9a39c31d22714de9352d (diff) | |
| download | ports-c15c6962cd911a44361cc58275d5e88a886957c2.tar.gz ports-c15c6962cd911a44361cc58275d5e88a886957c2.zip | |
Expand CONFLICTS to handle isc-dhcp42 and beyond
Prompted by: sunpoet
Notes
Notes:
svn path=/head/; revision=277438
Diffstat (limited to 'net/isc-dhcp41-server')
| -rw-r--r-- | net/isc-dhcp41-server/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/isc-dhcp41-server/Makefile b/net/isc-dhcp41-server/Makefile index 412d20c5b212..a444d7150264 100644 --- a/net/isc-dhcp41-server/Makefile +++ b/net/isc-dhcp41-server/Makefile @@ -41,13 +41,13 @@ OPTIONS+= DHCP_PARANOIA "Enable support for chroot" on \ # PORTREVISION and CONFLICTS handling .if ${SUBSYS} == client -CONFLICTS= isc-dhcp3?-client* +CONFLICTS= isc-dhcp3?-client* isc-dhcp4[2-9]-client* DHCP_PORTREVISION= ${PORTREVISION_CLIENT} .elif ${SUBSYS} == relay -CONFLICTS= isc-dhcp3?-relay* +CONFLICTS= isc-dhcp3?-relay* isc-dhcp4[2-9]-relay* DHCP_PORTREVISION= ${PORTREVISION_RELAY} .else -CONFLICTS= isc-dhcp3?-server* +CONFLICTS= isc-dhcp3?-server* isc-dhcp4[2-9]-server* DHCP_PORTREVISION= ${PORTREVISION_SERVER} .endif |