diff options
| author | pav <pav@FreeBSD.org> | 2010-11-23 17:57:57 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2010-11-23 17:57:57 +0800 |
| commit | 4b8b7d2a5efa86573b81f6d5acea8119474e6d80 (patch) | |
| tree | b3dc01598df1a2948b38e4cbc929cea050444bdf | |
| parent | 57c5e32b1536514b93dba3885caba27b46b5dc9c (diff) | |
| download | freebsd-ports-gnome-4b8b7d2a5efa86573b81f6d5acea8119474e6d80.tar.gz freebsd-ports-gnome-4b8b7d2a5efa86573b81f6d5acea8119474e6d80.tar.zst freebsd-ports-gnome-4b8b7d2a5efa86573b81f6d5acea8119474e6d80.zip | |
- Annotate conflict between math/surf and www/surf
PR: ports/152231
Reported by: Kostas Blekos <eelvex@gmail.com>
| -rw-r--r-- | math/surf/Makefile | 2 | ||||
| -rw-r--r-- | www/surf/Makefile | 2 |
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 |