- Annotate conflict between math/surf and www/surf

PR: ports/152231 Reported by: Kostas Blekos <eelvex@gmail.com>
svn path=/head/; revision=264987
2010-11-23 09:57:57 +00:00 · 2010-11-23 09:57:57 +00:00 · 8b69884e1a · 2021-03-31 03:12:20 +00:00
commit 8b69884e1a
parent ed51cc49de
2 changed files with 4 additions and 0 deletions
--- a/math/surf/Makefile
+++ b/math/surf/Makefile
@ -26,6 +26,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-cups --datadir=${PREFIX}/share

+CONFLICTS=	surf-0* # www/surf
+
 MAN1=		${PORTNAME}.1
 PORTDOCS=	manual.sgml
 PLIST_FILES=	bin/${PORTNAME} %%DATADIR%%/${PORTNAME}.xpm
--- a/www/surf/Makefile
+++ b/www/surf/Makefile
@ -22,6 +22,8 @@ MAN1=		surf.1
 PLIST_FILES=	bin/surf
 PORTDOCS=	LICENSE README

+CONFLICTS=	surf-1* # math/surf
+
 # Name conflicts with the math/surf port
 NO_LATEST_LINK=	yes