From 8b69884e1a49b74194f3133e090efe33fbca9cf0 Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Tue, 23 Nov 2010 09:57:57 +0000 Subject: [PATCH] - Annotate conflict between math/surf and www/surf PR: ports/152231 Reported by: Kostas Blekos --- math/surf/Makefile | 2 ++ www/surf/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/math/surf/Makefile b/math/surf/Makefile index eae845824e8e..0c594964a053 100644 --- 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 diff --git a/www/surf/Makefile b/www/surf/Makefile index 398d140e4825..6f93a167e3dd 100644 --- 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