diff options
| author | sunpoet <sunpoet@FreeBSD.org> | 2017-01-15 04:17:13 +0000 |
|---|---|---|
| committer | sunpoet <sunpoet@FreeBSD.org> | 2017-01-15 04:17:13 +0000 |
| commit | 753ebe8ba74542090edcc906712f9ac14e4a2cb3 (patch) | |
| tree | 5367631a763ac4795ec331e58b5d1a0bf30963b2 | |
| parent | e9c69546003ef24dc34241e7753cc6c2fce5b3ae (diff) | |
| download | FreeBSD-ports-753ebe8ba74542090edcc906712f9ac14e4a2cb3.zip FreeBSD-ports-753ebe8ba74542090edcc906712f9ac14e4a2cb3.tar.gz | |
Move CONFLICTS_INSTALL to slave port
| -rw-r--r-- | net/mtr-nox11/Makefile | 2 | ||||
| -rw-r--r-- | net/mtr/Makefile | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/net/mtr-nox11/Makefile b/net/mtr-nox11/Makefile index 5d78217..11fccc5 100644 --- a/net/mtr-nox11/Makefile +++ b/net/mtr-nox11/Makefile @@ -5,6 +5,8 @@ PKGNAMESUFFIX= -nox11 MASTERDIR= ${.CURDIR}/../mtr +CONFLICTS_INSTALL= mtr-[0-9]* + OPTIONS_EXCLUDE=X11 OPTIONS_FILE_UNSET= X11 diff --git a/net/mtr/Makefile b/net/mtr/Makefile index e6cfe05..771c712 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -13,6 +13,8 @@ COMMENT= Traceroute and ping in a single network diagnostic tool LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +CONFLICTS_INSTALL?= mtr-nox11-[0-9]* + OPTIONS_DEFINE= IPV6 X11 OPTIONS_DEFAULT=X11 X11_DESC= Build X11-enabled mtr @@ -29,12 +31,6 @@ IPV6_CONFIGURE_ENABLE= ipv6 X11_CONFIGURE_WITH= gtk X11_USE= GNOME=gtk20 -.if defined(PKGNAMESUFFIX) -CONFLICTS_INSTALL= mtr-0* -.else -CONFLICTS_INSTALL= mtr-nox11-0* -.endif - post-patch: @${REINPLACE_CMD} -e 's|getopt.*$$(OBJEXT)||g; s|getopt.*[ch]||g; /getopt.*Po/d' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|"getopt\.h"|<getopt.h>|g' ${WRKSRC}/mtr.c |
