12 files changed, 2 insertions, 21 deletions

diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
index 833900410701..946f1fd72335 100644
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -80,11 +80,7 @@ RADIUS_GROUP=	freeradius
 USERS=		${RADIUS_USER}
 GROUPS=		${RADIUS_GROUP}
 
-.if ${PORT_OPTIONS:MHEIMDAL} && empty(PORT_OPTIONS:MKERBEROS)
-${UNIQUENAME}_SET+=	KERBEROS
-.endif
-
-.if ${PORT_OPTIONS:MKERBEROS}
+.if ${PORT_OPTIONS:MKERBEROS} || ${PORT_OPTIONS:MHEIMDAL}
 .if ${PORT_OPTIONS:MHEIMDAL}
 .if ${PORT_OPTIONS:MHEIMDAL_PORT}
 LIB_DEPENDS+=	libkrb5.so:${PORTSDIR}/security/heimdal
diff --git a/net/hping-devel/Makefile b/net/hping-devel/Makefile
index 0c6353fa935d..2795bd3d6a0f 100644
--- a/net/hping-devel/Makefile
+++ b/net/hping-devel/Makefile
@@ -13,7 +13,6 @@ COMMENT=	Network auditing tool
 
 LIB_DEPENDS=	libtcl84.so:${PORTSDIR}/lang/tcl84
 
-NO_LATEST_LINK=	yes
 CONFLICTS=	hping-[0-9]*
 
 GNU_CONFIGURE=	yes
diff --git a/net/isc-dhcp41-server/Makefile b/net/isc-dhcp41-server/Makefile
index 0211674451dd..ee4cc584e6d1 100644
--- a/net/isc-dhcp41-server/Makefile
+++ b/net/isc-dhcp41-server/Makefile
@@ -23,8 +23,6 @@ PORTREVISION_RELAY=	5
 SUBSYS?=	server
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
 
-UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-
 OPTIONS_DEFINE=	IPV6
 OPTIONS_DEFAULT=IPV6
 
diff --git a/net/isc-dhcp42-server/Makefile b/net/isc-dhcp42-server/Makefile
index 0ca6d9c74d75..d4d0c6689798 100644
--- a/net/isc-dhcp42-server/Makefile
+++ b/net/isc-dhcp42-server/Makefile
@@ -25,8 +25,6 @@ PORTREVISION_RELAY=	0
 SUBSYS?=	server
 #WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
 
-UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-
 OPTIONS_DEFINE=	IPV6
 OPTIONS_DEFAULT=IPV6
 
diff --git a/net/isc-dhcp43-server/Makefile b/net/isc-dhcp43-server/Makefile
index 0f6909c08798..a6c77dab76bb 100644
--- a/net/isc-dhcp43-server/Makefile
+++ b/net/isc-dhcp43-server/Makefile
@@ -25,8 +25,6 @@ PORTREVISION_RELAY=	0
 SUBSYS?=	server
 #WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
 
-UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-
 OPTIONS_DEFINE=	IPV6
 OPTIONS_DEFAULT=IPV6
 
diff --git a/net/mosh/Makefile b/net/mosh/Makefile
index 29243b1460e4..7d139faf0d25 100644
--- a/net/mosh/Makefile
+++ b/net/mosh/Makefile
@@ -23,8 +23,6 @@ INSTALL_TARGET=	install-strip
 USE_OPENSSL=	yes
 USES=		autoreconf:autoconf perl5 pkgconfig
 
-LATEST_LINK=	mosh-term
-
 CONFLICTS_INSTALL=	mosh-0.[2-9].*
 
 PLIST_FILES=	bin/mosh bin/mosh-server bin/mosh-client \
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index f79875c94ea0..b1f4e5a238df 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -29,8 +29,6 @@ CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.[0-3].* \
 .endif
 .else
 PKGNAMESUFFIX?=		-server
-# Do not use ${PKGNAMESUFFIX} here has it can change later
-OPTIONSFILE?=		${PORT_DBDIR}/${PORTNAME}24-server/options
 .endif
 EXTRACT_SUFX=		.tgz
 
diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index ed32d0ed0bb0..8caf697e1582 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
@@ -24,7 +24,7 @@ USES=		fortran gmake libtool:keepla perl5 pkgconfig tar:bzip2
 USE_PERL5=	build
 
 MPIBASE?=	mpi
-MPIDIR?=	${MPIBASE}/${UNIQUENAME}
+MPIDIR?=	${MPIBASE}/${PKGBASE}
 
 PLIST_SUB+=	MPIBASE=${MPIBASE}
 PLIST_SUB+=	MPIDIR=${MPIDIR}
diff --git a/net/proftpd-mod_ldap/Makefile b/net/proftpd-mod_ldap/Makefile
index 82271e0b6b09..77ba0f09c5ad 100644
--- a/net/proftpd-mod_ldap/Makefile
+++ b/net/proftpd-mod_ldap/Makefile
@@ -13,7 +13,6 @@ LICENSE=	GPLv2
 
 DESCR=		${.CURDIR}/pkg-descr
 
-LATEST_LINK=	${PKGNAMEPREFIX}-${PORTNAME}
 MASTERDIR=	${.CURDIR}/../../ftp/proftpd
 
 USE_OPENLDAP=	yes
diff --git a/net/py-gntp/Makefile b/net/py-gntp/Makefile
index 2377d29588ec..cbdb66fa1367 100644
--- a/net/py-gntp/Makefile
+++ b/net/py-gntp/Makefile
@@ -14,7 +14,6 @@ LICENSE=	MIT
 
 GH_ACCOUNT=	kfdm
 
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	DOCS
 
 USE_GITHUB=	yes
diff --git a/net/py-pynsq/Makefile b/net/py-pynsq/Makefile
index 59cc89c043e2..dd21a70d1050 100644
--- a/net/py-pynsq/Makefile
+++ b/net/py-pynsq/Makefile
@@ -20,7 +20,6 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tornado>0:${PORTSDIR}/www/py-tornado \
 
 OPTIONS_DEFINE=	TESTS
 TESTS_DESC=	Install tools to run test suite
-OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/net/samba36/Makefile b/net/samba36/Makefile
index feb64d8dd3b3..b5dd735dd1f6 100644
--- a/net/samba36/Makefile
+++ b/net/samba36/Makefile
@@ -22,7 +22,6 @@ SAMBA_BASENAME=		samba
 CPE_VENDOR=		samba
 CPE_PRODUCT=		samba
 
-LATEST_LINK=		${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 EXAMPLESDIR=		${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 PATCH_WRKSRC=		${WRKDIR}/${DISTNAME}
 WRKSRC=			${WRKDIR}/${DISTNAME}/source3