diff --git a/math/atlas-devel/Makefile b/math/atlas-devel/Makefile
index b9b46f32db7a..23996880a9fb 100644
--- a/math/atlas-devel/Makefile
+++ b/math/atlas-devel/Makefile
@@ -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>
 
diff --git a/math/atlas/Makefile b/math/atlas/Makefile
index 3cc770cbd33a..ec5e8eb0703e 100644
--- a/math/atlas/Makefile
+++ b/math/atlas/Makefile
@@ -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 \
diff --git a/math/glpk/Makefile b/math/glpk/Makefile
index 51f40cf375a0..0dfbb2220f77 100644
--- a/math/glpk/Makefile
+++ b/math/glpk/Makefile
@@ -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>
 
diff --git a/math/testu01/Makefile b/math/testu01/Makefile
index f20a23f492f5..e95e52f5ab5b 100644
--- a/math/testu01/Makefile
+++ b/math/testu01/Makefile
@@ -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
diff --git a/www/links/Makefile b/www/links/Makefile
index 9e79f54f57cf..2370490a4105 100644
--- a/www/links/Makefile
+++ b/www/links/Makefile
@@ -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