Index: graphics/proj5/Makefile
===================================================================
--- graphics/proj5/Makefile	(revision 503336)
+++ graphics/proj5/Makefile	(working copy)
@@ -6,6 +6,7 @@
 PORTEPOCH=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://download.osgeo.org/proj/
+PKGNAMESUFFIX=	5
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATUM_GRID_FILES}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -15,6 +16,8 @@
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+CONFLICTS_INSTALL=	proj-6.[0-9]*.[0-9]*
+
 DATUM_GRID_FILES=	proj-datumgrid-1.7.zip
 
 GNU_CONFIGURE=	yes
Index: graphics/proj5/distinfo
===================================================================
Index: graphics/proj5/pkg-descr
===================================================================
Index: graphics/proj5/pkg-plist
===================================================================
Index: misc/survex/Makefile
===================================================================
--- misc/survex/Makefile	(revision 503336)
+++ misc/survex/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	survex
 DISTVERSION=	1.2.38
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	https://survex.com/software/${DISTVERSION}/
 
@@ -12,7 +13,7 @@
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
-		libproj.so:graphics/proj
+		libproj.so:graphics/proj5
 
 USES=		compiler:c++11-lang desktop-file-utils gl gmake gnome pkgconfig shared-mime-info
 GNU_CONFIGURE=	yes
Index: misc/zygrib/Makefile
===================================================================
--- misc/zygrib/Makefile	(revision 503336)
+++ misc/zygrib/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	zygrib
 DISTVERSION=	8.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://www.zygrib.org/getfile.php?file=
 DISTNAME=	zyGrib-${DISTVERSION}
@@ -18,7 +18,7 @@
 LIB_DEPENDS=	libjasper.so:graphics/jasper \
 		libnova.so:astro/libnova \
 		libpng16.so:graphics/png \
-		libproj.so:graphics/proj \
+		libproj.so:graphics/proj5 \
 		libqwt6.so:x11-toolkits/qwt6
 
 USES=		gmake localbase tar:tgz qt:5
Index: graphics/p5-Geo-Proj4/Makefile
===================================================================
--- graphics/p5-Geo-Proj4/Makefile	(revision 503336)
+++ graphics/p5-Geo-Proj4/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Proj4
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	graphics devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -13,7 +14,7 @@
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libproj.so:graphics/proj
+LIB_DEPENDS=	libproj.so:graphics/proj5
 
 CONFIGURE_ENV=	GEOPROJ_FWTOOLS_DIR=${LOCALBASE}
 MAKE_ENV=	INC=-I${LOCALBASE}/include