mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

add some CONFLICTS [1]; minor clean-up

Browse Source 
Reported by:	S.-M. Silber [1]
This commit is contained in:
Brendan Fabeny 2012-06-09 04:55:58 +00:00
parent 67ec3bd0a2
commit 0edb6def94
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=298795
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
math/atlas-devel/Makefile
View File

@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/ATLAS
USE_LDCONFIG= yes
CONFLICTS= atlas-[0-9]*
CONFLICTS= atlas-[0-9]* cblas-[0-9]*
.include <bsd.port.pre.mk>

2
math/atlas/Makefile
View File

@ -23,7 +23,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/math/lapack:checksum
USE_BZIP2= yes
USE_FORTRAN= yes
CONFLICTS= atlas-devel-[0-9]*
CONFLICTS= atlas-devel-[0-9]* cblas-[0-9]*
MANUAL_PACKAGE_BUILD= Optimizes for the local machine.
OPTIONS= ARCHDEF "Use a specified architectural default" off \

5
math/glpk/Makefile
View File

@ -14,10 +14,10 @@ MASTER_SITE_SUBDIR= glpk
MAINTAINER= bf@FreeBSD.org
COMMENT= A GNU Linear Programming Kit
LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp
LICENSE= GPLv3
LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp
OPTIONS= IODBC "Enable MathProg iodbc support" Off \
MYSQL "Enable MathProg mysql support" Off
@ -28,6 +28,7 @@ CFLAGS+= -trigraphs
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-gmp
CONFLICTS= goblin-[0-9]*
.include <bsd.port.pre.mk>

1
math/testu01/Makefile
View File

@ -29,6 +29,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= yes
CFLAGS+= -fPIC
PLIST_SUB= PORTNAME="${PORTNAME}"
CONFLICTS= emboss-[0-9]*
post-patch:
@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure

10
www/links/Makefile
View File

@ -17,7 +17,7 @@ COMMENT= Lynx-like text WWW browser
LICENSE= GPLv2
CONFLICTS= links-0*
CONFLICTS= links-0* links-hacked-[0-9]*
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-ssl --without-pmshell --without-atheos \
@ -38,20 +38,20 @@ OPTIONS= SVGALIB "non-X11 graphics support" off \
.include <bsd.port.options.mk>
.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
LIB_DEPENDS+= lzma.5:${PORTSDIR}/archivers/xz
LIB_DEPENDS+= lzma:${PORTSDIR}/archivers/xz
.endif
.ifdef(WITH_SVGALIB) || defined(WITH_X11) || defined(WITH_DIRECTFB)
LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \
jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
jpeg:${PORTSDIR}/graphics/jpeg \
tiff:${PORTSDIR}/graphics/tiff
CONFIGURE_ARGS+= --enable-graphics
.else
CONFIGURE_ARGS+= --disable-graphics --without-libjpeg --without-libtiff
.endif
.ifdef(WITH_SVGALIB)
LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib
LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib
CONFIGURE_ARGS+= --with-svgalib
.else
CONFIGURE_ARGS+= --without-svgalib