diff -aru ports.orig/net-mgmt/netsaint-plugins/Makefile.inc ports/net-mgmt/netsaint-plugins/Makefile.inc
--- ports.orig/net-mgmt/netsaint-plugins/Makefile.inc	Sun Sep 26 11:39:15 2004
+++ ports/net-mgmt/netsaint-plugins/Makefile.inc	Sun Sep 26 12:03:22 2004
@@ -4,8 +4,8 @@
 BUILD_DEPENDS+=	fping:${PORTSDIR}/net/fping
 RUN_DEPENDS+=	fping:${PORTSDIR}/net/fping
 CONFIGURE_ARGS+=	--enable-fping
-BUILD_DEPENDS+=	snmpcheck:${PORTSDIR}/net/net-snmp
-RUN_DEPENDS+=	snmpcheck:${PORTSDIR}/net/net-snmp
+BUILD_DEPENDS+=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp
+RUN_DEPENDS+=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp
 CONFIGURE_ARGS+=	--enable-snmp
 LIB_DEPENDS+=	radiusclient.0:${PORTSDIR}/net/radiusclient
 CONFIGURE_ARGS+=	--enable-radius
@@ -14,7 +14,7 @@
 POSTGRESQL_PORT?=	databases/postgresql7
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20-client
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21-client
 CONFIGURE_ARGS+=	--enable-ldap
 PLIST_SUB+=	SUB_QSTAT=""
 PLIST_SUB+=	SUB_FPING=""
diff -aru ports.orig/www/mod_php3/Makefile.inc ports/www/mod_php3/Makefile.inc
--- ports.orig/www/mod_php3/Makefile.inc	Sun Sep 26 12:32:40 2004
+++ ports/www/mod_php3/Makefile.inc	Sun Sep 26 13:46:37 2004
@@ -12,14 +12,14 @@
 POSTGRESQL_PORT?=	databases/postgresql7
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 CONFIGURE_ARGS+=--with-pgsql=${PREFIX}
-LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12
-LIB_DEPENDS+=	lber.1:${PORTSDIR}/net/openldap12
+LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap21-client
+LIB_DEPENDS+=	lber.1:${PORTSDIR}/net/openldap21-client
 CONFIGURE_ARGS+=--with-ldap=${PREFIX}
-LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net/net-snmp
+LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net-mgmt/net-snmp
 CONFIGURE_ARGS+=--with-snmp=${PREFIX} --enable-ucd-snmp-hack
-BUILD_DEPENDS+=	${PREFIX}/lib/libexpat.a:${PORTSDIR}/textproc/expat
-BUILD_DEPENDS+=	${PREFIX}/include/xml/xmlparse.h:${PORTSDIR}/textproc/expat
-BUILD_DEPENDS+=	${PREFIX}/include/xml/xmltok.h:${PORTSDIR}/textproc/expat
+BUILD_DEPENDS+=	${PREFIX}/lib/libexpat.a:${PORTSDIR}/textproc/expat2
+BUILD_DEPENDS+=	${PREFIX}/include/xml/xmlparse.h:${PORTSDIR}/textproc/expat2
+BUILD_DEPENDS+=	${PREFIX}/include/xml/xmltok.h:${PORTSDIR}/textproc/expat2
 CONFIGURE_ARGS+=--with-xml=${PREFIX}
 CONFIGURE_ARGS+=--with-ftp
 LIB_DEPENDS+=	intl.5:${PORTSDIR}/devel/gettext
