diff --git a/MOVED b/MOVED
index ca980c1190d4..eb50e0db1025 100644
--- a/MOVED
+++ b/MOVED
@@ -6985,7 +6985,6 @@ net/cvsup||2014-09-09|Cascade removal (lang/ezm3)
 dns/posadis||2014-09-09|Not staged
 net/etherboot||2014-09-09|Not staged
 games/linux-savage||2014-09-09|Not staged
-lang/neko||2014-09-09|Not staged
 lang/ifc||2014-09-09|Not staged
 japanese/rskkserv||2014-09-09|Not staged
 graphics/passepartout||2014-09-09|Not staged
@@ -8796,14 +8795,14 @@ net/remmina-plugin-i18n||2016-11-08|Plugin translations removed upstream in GH c
 net/p5-Net-Ping||2016-11-08|Has expired: This or newer version included in all supported versions of perl
 ftp/curl-hiphop||2016-11-08|Has expired: useful only for removed hiphop-php
 textproc/rubygem-string-scrub||2016-11-08|Has expired: needed only for EOL versions of Ruby
-cad/py-gdsii|cad/python-gdsii|2016-11-10|Renamed
 textproc/erlang-p1xml|textproc/erlang-fast_xml|2016-11-08|Project was renamed
+cad/py-gdsii|cad/python-gdsii|2016-11-10|Renamed
 devel/py-pydasm|devel/py-capstone|2016-11-11|Has expired: No more upstream and known bugs, use devel/py-capstone instead
 devel/libdasm|devel/capstone3|2016-11-11|Has expired: No more upstream and known bugs, use devel/capstone3 instead
 security/erlang-p1tls|security/erlang-fast_tls|2016-11-11|Project was renamed
 mail/trojita-qt4|mail/trojita|2016-11-13|Qt4 support was dropped, use mail/trojita instead
 devel/extra-cmake-modules|devel/kf5-extra-cmake-modules|2016-11-14|Renamed to match other KF5 port
-net/vnc||2016-11-14|Has expired: Distfiles no longer available.
+net/vnc||2016-11-14|Has expired: Distfiles no longer available
 sysutils/gosa||2016-11-20|Has expired: this version of gosa cannot be fixed (requires PHP < 5.4)
 security/krb5-112||2016-11-20|Has expired: EOL twelve months after release of krb5-1.14
 astro/osmium|astro/libosmium|2016-11-23|Rename according to upstream
@@ -8813,3 +8812,4 @@ textproc/clucene-qt5||2016-11-25|Reintegrated into devel/qt5-help
 devel/go-shellwords||2016-11-26|Integrated into textproc/fzf build procedure
 www/gecko-sharp20||2016-11-27|Has expired: Broken, no upstream found and no release in 8 years
 net-mgmt/rancid|net-mgmt/rancid3|2016-11-27|Has expired: Not supported upstream. Please upgrade to net-mgmt/rancid3
+x11-servers/mga_hal||2016-11-28|Support for MGA_HAL feature was removed from xf86-video-mga in 2011
diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk
index 6613bd2e57c1..240f235bde5a 100644
--- a/Mk/Uses/php.mk
+++ b/Mk/Uses/php.mk
@@ -244,7 +244,7 @@ do-install:
 			${STAGEDIR}${PREFIX}/include/php/ext/${PHP_MODNAME}/${header}
 .    endfor
 	@${RM} ${STAGEDIR}${PREFIX}/include/php/ext/${PHP_MODNAME}/config.h
-	@${GREP} "#define \(COMPILE\|HAVE\|USE\)_" ${WRKSRC}/config.h \
+	@${EGREP} "#define (COMPILE|HAVE|USE)_" ${WRKSRC}/config.h \
 		> ${STAGEDIR}${PREFIX}/include/php/ext/${PHP_MODNAME}/config.h
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/php
 .    if ${php_ARGS:Mzend}