summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--math/surf/Makefile2
-rw-r--r--www/surf/Makefile2
2 files changed, 4 insertions, 0 deletions
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