Index: Mk/Scripts/check-stagedir.sh
===================================================================
--- Mk/Scripts/check-stagedir.sh	(revision 368261)
+++ Mk/Scripts/check-stagedir.sh	(working copy)
@@ -467,7 +467,6 @@
 sort -u ${WRKDIR}/.plist-dirs-unsorted-no-comments \
     >${WRKDIR}/.plist-dirs-sorted-no-comments
 
-check_invalid_directories_mtree || ret=1
 check_invalid_directories_from_dependencies || ret=1
 check_missing_plist_items || ret=1
 
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk	(revision 368261)
+++ Mk/bsd.port.mk	(working copy)
@@ -3710,40 +3710,9 @@
 .endif
 
 .if !target(install-mtree)
-install-mtree: ${PREFIX}
-	@if [ ${UID} != 0 ]; then \
-		if [ -w ${PREFIX}/ ]; then \
-			${ECHO_MSG} "Warning: not superuser, you may get some errors during installation."; \
-		else \
-			${ECHO_MSG} "Error: ${PREFIX}/ not writable."; \
-			${FALSE}; \
-		fi; \
-	fi
-.if !defined(NO_MTREE)
-	@if [ ${UID} = 0 ]; then \
-		if [ ! -f ${MTREE_FILE} ]; then \
-			${ECHO_MSG} "Error: mtree file \"${MTREE_FILE}\" is missing."; \
-			${ECHO_MSG} "Copy it from a suitable location (e.g., ${SRC_BASE}/etc/mtree) and try again."; \
-			exit 1; \
-		else \
-			${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/ >/dev/null; \
-			if [ ${PREFIX} = ${LOCALBASE} -a "${MTREE_FILE_DEFAULT}" = "yes" ]; then \
-				cd ${PREFIX}/share/nls; \
-				for link in POSIX en_US.US-ASCII; \
-				do \
-					if [ x"`${READLINK_CMD} $${link}`" != x"C" ]; \
-					then \
-						${LN} -shf C $${link}; \
-					fi; \
-				done; \
-			fi; \
-		fi; \
-	else \
-		${ECHO_MSG} "Warning: not superuser, can't run mtree."; \
-		${ECHO_MSG} "You may want to become root and try again to ensure correct permissions."; \
-	fi
+install-mtree:
+	@${DO_NADA}
 .endif
-.endif
 
 .if !target(install-ldconfig-file)
 install-ldconfig-file:
Index: devel/automake/Makefile
===================================================================
--- devel/automake/Makefile	(revision 368261)
+++ devel/automake/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	automake
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
Index: devel/automake/pkg-plist
===================================================================
--- devel/automake/pkg-plist	(revision 368261)
+++ devel/automake/pkg-plist	(working copy)
@@ -114,6 +114,7 @@
 share/automake-%%BUILD_VERSION%%/test-driver
 share/automake-%%BUILD_VERSION%%/texinfo.tex
 share/automake-%%BUILD_VERSION%%/ylwrap
+@dir share/aclocal
 @dirrm share/aclocal-%%BUILD_VERSION%%/internal
 @dirrm share/aclocal-%%BUILD_VERSION%%
 @dirrm share/automake-%%BUILD_VERSION%%/Automake
Index: devel/automake14/Makefile
===================================================================
--- devel/automake14/Makefile	(revision 368261)
+++ devel/automake14/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	automake
 PORTVERSION=	1.4.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
Index: devel/automake14/pkg-plist
===================================================================
--- devel/automake14/pkg-plist	(revision 368261)
+++ devel/automake14/pkg-plist	(working copy)
@@ -75,5 +75,6 @@
 share/automake-%%BUILD_VERSION%%/texinfo.tex
 share/automake-%%BUILD_VERSION%%/texinfos.am
 share/automake-%%BUILD_VERSION%%/ylwrap
+@dir share/aclocal
 @dirrm share/aclocal-%%BUILD_VERSION%%
 @dirrm share/automake-%%BUILD_VERSION%%
Index: devel/desktop-file-utils/Makefile
===================================================================
--- devel/desktop-file-utils/Makefile	(revision 368261)
+++ devel/desktop-file-utils/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	desktop-file-utils
 PORTVERSION=	0.22
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://freedesktop.org/software/${PORTNAME}/releases/
 
Index: devel/desktop-file-utils/pkg-plist
===================================================================
--- devel/desktop-file-utils/pkg-plist	(revision 368261)
+++ devel/desktop-file-utils/pkg-plist	(working copy)
@@ -7,3 +7,4 @@
 man/man1/desktop-file-validate.1.gz
 man/man1/update-desktop-database.1.gz
 share/emacs/site-lisp/desktop-entry-mode.el
+@dir share/applications
Index: ports-mgmt/pkg/Makefile
===================================================================
--- ports-mgmt/pkg/Makefile	(revision 368261)
+++ ports-mgmt/pkg/Makefile	(working copy)
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	pkg
-DISTVERSION=	1.3.7
+DISTVERSION=	1.3.7.99
+_PKG_VERSION=	${DISTVERSION}
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	\
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
@@ -13,8 +14,6 @@
 
 LICENSE=	BSD2CLAUSE
 
-USES=		tar:xz uidfix
-
 # Disable CCACHE support because of the chicken/egg problem pkg should always
 # With no dependency at all
 NO_CCACHE=	yes
Index: ports-mgmt/pkg/distinfo
===================================================================
--- ports-mgmt/pkg/distinfo	(revision 368261)
+++ ports-mgmt/pkg/distinfo	(working copy)
@@ -1,2 +1,3 @@
-SHA256 (pkg-1.3.7.tar.xz) = 4368adae7c768ef38f0359e091efd8f13759e0a2be2e5cd9dba5b4cf359fb004
-SIZE (pkg-1.3.7.tar.xz) = 1776756
+SHA256 (pkg-1.3.7.99.tar.xz) = 567f97e9aad6b83ba1b966319123afeebab32ba3e4f28326e501b26c32d637d0
+SIZE (pkg-1.3.7.99.tar.xz) = 1790424
+
Index: textproc/xmlcatmgr/Makefile
===================================================================
--- textproc/xmlcatmgr/Makefile	(revision 368261)
+++ textproc/xmlcatmgr/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xmlcatmgr
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF
 
@@ -27,6 +28,7 @@
 		CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} \
 		CATALOG_PORTS_XML=${CATALOG_PORTS_XML}
 PLIST_FILES=	bin/xmlcatmgr man/man1/xmlcatmgr.1.gz
+PLIST_DIRS=	share/xml share/sgml
 PORTDOCS=	AUTHORS COPYING NEWS README TODO
 
 XMLCATMGR?=		${PREFIX}/bin/xmlcatmgr