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

- Annotate conflict between math/surf and www/surf

Browse source 
PR:		ports/152231
Reported by:	Kostas Blekos <eelvex@gmail.com>
This commit is contained in:
Pav Lucistnik 2010-11-23 09:57:57 +00:00
parent ed51cc49de
commit 8b69884e1a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=264987
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
math/surf/Makefile
View file

@ -26,6 +26,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-cups --datadir=${PREFIX}/share CONFIGURE_ARGS= --disable-cups --datadir=${PREFIX}/share
CONFLICTS= surf-0* # www/surf
MAN1= ${PORTNAME}.1 MAN1= ${PORTNAME}.1
PORTDOCS= manual.sgml PORTDOCS= manual.sgml
PLIST_FILES= bin/${PORTNAME} %%DATADIR%%/${PORTNAME}.xpm PLIST_FILES= bin/${PORTNAME} %%DATADIR%%/${PORTNAME}.xpm

2
www/surf/Makefile
View file

@ -22,6 +22,8 @@ MAN1= surf.1
PLIST_FILES= bin/surf PLIST_FILES= bin/surf
PORTDOCS= LICENSE README PORTDOCS= LICENSE README
CONFLICTS= surf-1* # math/surf
# Name conflicts with the math/surf port # Name conflicts with the math/surf port
NO_LATEST_LINK= yes NO_LATEST_LINK= yes