sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move CONFLICTS_INSTALL to slave port

Browse source
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2017-01-15 04:17:13 +00:00
parent fed7629a4d
commit 238eb28f29
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=431516
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/mtr-nox11/Makefile
View file

@ -5,6 +5,8 @@ PKGNAMESUFFIX= -nox11
MASTERDIR= ${.CURDIR}/../mtr
CONFLICTS_INSTALL= mtr-[0-9]*
OPTIONS_EXCLUDE=X11
OPTIONS_FILE_UNSET= X11

8
net/mtr/Makefile
View file

@ -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