Index: net-mgmt/net-snmp/Makefile
===================================================================
--- net-mgmt/net-snmp/Makefile
+++ net-mgmt/net-snmp/Makefile
@@ -18,9 +18,11 @@
 NOT_FOR_ARCHS=		mips mips64
 NOT_FOR_ARCHS_REASON=	SSP is currently broken on MIPS
 
+USES=		cpe libtool perl5 ssl
+
 OPTIONS_DEFINE=	IPV6 MFD_REWRITES PERL PERL_EMBEDDED PYTHON DUMMY TKMIB \
 		MYSQL AX_SOCKONLY UNPRIVILEGED SMUX DOCS JAIL AX_DISABLE_TRAP \
-		TLS NEWSYSLOG NOLIBPKG SCTP
+		TLS NEWSYSLOG NOLIBPKG SCTP PCRE
 OPTIONS_DEFAULT=PERL PERL_EMBEDDED DUMMY SMUX NEWSYSLOG
 OPTIONS_SUB=	yes
 
@@ -44,12 +46,11 @@
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	snmpd snmptrapd
 USE_LDCONFIG=	yes
-USES=		cpe libtool perl5 ssl
 CPE_PRODUCT=	net-snmp
 USE_PERL5=	build run
 USE_CSTD=	c99
 
-CFLAGS+=	-I${LOCALBASE}/include -I${PKG_PREFIX}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	PERLPROG="${PERL}" PSPROG="${PS_CMD}" SED="${SED}"
 CONFIGURE_ARGS+=--enable-shared --enable-internal-md5 \
@@ -58,8 +59,7 @@
 		--with-sys-location="${NET_SNMP_SYS_LOCATION}" \
 		--with-logfile="${NET_SNMP_LOGFILE}" \
 		--with-persistent-directory="${NET_SNMP_PERSISTENTDIR}" \
-		--with-gnu-ld --without-libwrap \
-		--with-ldflags="-lm -lkvm -ldevstat -L${PKG_PREFIX}/lib -L${LOCALBASE}/lib ${LCRYPTO}"
+		--with-gnu-ld --without-libwrap
 SUB_FILES=	pkg-message
 
 .if !defined(WITHOUT_SSP)
@@ -77,9 +77,8 @@
 .if ${PORT_OPTIONS:MPYTHON}
 PYDISTUTILS_PKGNAME?=		netsnmp-python
 PYDISTUTILS_PKGVERSION?=	1.0a1
-USES+=		python
-RUN_DEPENDS+=	${PY_SETUPTOOLS}
-BUILD_DEPENDS+=	${PY_SETUPTOOLS}
+USES+=		python:3.5+
+USE_PYTHON+=	distutils
 CONFIGURE_ARGS+=--with-python-modules
 CONFIGURE_ENV+=	PYTHONPROG="${PYTHON_CMD}"
 MAKE_ENV+=	PYDISTUTILS_INSTALLARGS="${PYDISTUTILS_INSTALLARGS}" STAGEDIR="${STAGEDIR}"
@@ -91,6 +90,13 @@
 
 CONFIGURE_ARGS+=--with-openssl="${OPENSSLBASE}"
 
+.if ${PORT_OPTIONS:MPCRE}
+CONFIGURE_ARGS+=--with-pcre
+LIB_DEPENDS+=	libpcre.so:devel/pcre
+.else
+CONFIGURE_ARGS+=--without-pcre
+.endif
+
 .if ${PORT_OPTIONS:MDUMMY}
 CONFIGURE_ARGS+=--with-dummy-values
 .endif
@@ -135,9 +141,11 @@
 
 .if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=--enable-ipv6
-# --with-transport="UDPIPv6 TCPIPv6" --with-modules=mibII/ipv6"
+CONFIGURE_ARGS+=--with-transports="UDPIPv6 TCPIPv6"
+NET_SNMP_WITH_MIB_MODULE_LIST+=	mibII/ipv6
 PLIST_SUB+=	WITH_IPV6=""
 .else
+NET_SNMP_WITHOUT_MIB_MODULE_LIST+=	mibII/ipv6
 PLIST_SUB+=	WITH_IPV6="@comment "
 .endif
 
@@ -157,10 +165,6 @@
 NET_SNMP_PERSISTENTDIR?=/var/net-snmp
 NET_SNMP_WITH_MIB_MODULE_LIST+=	host disman/event-mib mibII/mta_sendmail mibII/tcpTable ucd-snmp/diskio
 
-.if ${OPSYS} == FreeBSD
-NET_SNMP_WITHOUT_MIB_MODULE_LIST+=	mibII/ipv6
-.endif
-
 .if ${PORT_OPTIONS:MSCTP}
 NET_SNMP_WITH_MIB_MODULE_LIST+=	sctp-mib
 .endif
@@ -216,10 +220,9 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${SSL_DEFAULT} != base
-LCRYPTO=	-lcrypto
-.else
-LCRYPTO=
+.if ${LOCALBASE} != ${PREFIX}
+CPPFLAGS+=	-I${PREFIX}/include
+LDFLAGS+=	-L${PREFIX}/lib
 .endif
 
 pre-everything::
@@ -262,6 +265,8 @@
 		-e 's|pkg[.]h|ignore-pkg.h|g' \
 		-e 's|in pkg ;|in ignore-pkg ;|' \
 		${WRKSRC}/configure
+.else
+LIB_DEPENDS+=	libpkg.so:ports-mgmt/pkg
 .endif
 
 post-configure: