diff --git a/deskutils/everygui/Makefile b/deskutils/everygui/Makefile
index f6166392937c..b565fb3ad0c3 100644
--- a/deskutils/everygui/Makefile
+++ b/deskutils/everygui/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Dynamic GUI for an OS command
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
+PYDISTUTILS_AUTOPLIST=	yes
 USE_GNOME=	libglade2 pygnome2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-NO_STAGE=	yes
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.py" | ${XARGS} ${REINPLACE_CMD} -e\
 		's,/usr/share,${PREFIX}/share,g' -e\
diff --git a/deskutils/everygui/pkg-plist b/deskutils/everygui/pkg-plist
deleted file mode 100644
index 790d02ba4870..000000000000
--- a/deskutils/everygui/pkg-plist
+++ /dev/null
@@ -1,37 +0,0 @@
-bin/egdesign
-bin/everygui
-share/everygui/docs/AUTHORS
-share/everygui/docs/COPYING
-share/everygui/docs/ChangeLog
-share/everygui/docs/LGPL
-share/everygui/docs/README
-share/everygui/docs/TODO
-share/everygui/egconfig/cdrecord_all.egd
-share/everygui/egconfig/cdrecord_iso.egd
-share/everygui/egconfig/lame_abr.egd
-share/everygui/egconfig/lame_cbr.egd
-share/everygui/egconfig/lame_vbr.egd
-share/everygui/egconfig/map2dif.egd
-share/everygui/egconfig/mencoder_xvid_bitrate.egd
-share/everygui/egconfig/mencoder_xvid_quality.egd
-share/everygui/egconfig/mkisofs.egd
-share/everygui/egconfig/mount_iso.egd
-share/everygui/egconfig/my_commands.egd
-share/everygui/egconfig/normalize.egd
-share/everygui/egconfig/rpm_install.egd
-share/everygui/egconfig/sf_net_release.egd
-share/everygui/egconfig/tar_create.egd
-share/everygui/egconfig/tar_extract.egd
-share/everygui/egconfig/webcpp.egd
-share/everygui/ui/egdesigner.glade
-share/everygui/ui/everygui.glade
-src/everygui/designer.py
-src/everygui/everygui.py
-src/everygui/libglade.py
-src/everygui/libglade.pyc
-@dirrm share/everygui/docs
-@dirrm share/everygui/egconfig
-@dirrm share/everygui/ui
-@dirrm share/everygui
-@dirrm src/everygui
-@dirrm src
diff --git a/deskutils/pypanel/Makefile b/deskutils/pypanel/Makefile
index dc0e2dea4959..6bca76c59824 100644
--- a/deskutils/pypanel/Makefile
+++ b/deskutils/pypanel/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	PyPanel-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Desktop panel written in Python
 
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so.9:${PORTSDIR}/print/freetype2
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Xlib/X.py:${PORTSDIR}/x11-toolkits/py-xlib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
@@ -19,11 +19,11 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 USE_EFL=	imlib2
 USE_XORG=	xft
+PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	PyPanel
 
 PORTDOCS=	*
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/bin/freetype-config|${LOCALBASE}/bin/freetype-config|; \
@@ -41,8 +41,8 @@ post-patch:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/deskutils/pypanel/pkg-plist b/deskutils/pypanel/pkg-plist
deleted file mode 100644
index 836d885950c3..000000000000
--- a/deskutils/pypanel/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/pypanel
-%%DATADIR%%/ppicon.png
-%%DATADIR%%/pypanelrc
-%%PYTHON_SITELIBDIR%%/ppmodule.so
-@dirrm %%DATADIR%%
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
diff --git a/deskutils/vnc2flv/Makefile b/deskutils/vnc2flv/Makefile
index 7a9ac36e6335..733e00c48a65 100644
--- a/deskutils/vnc2flv/Makefile
+++ b/deskutils/vnc2flv/Makefile
@@ -18,8 +18,8 @@ RUN_DEPENDS+=	x11vnc:${PORTSDIR}/net/x11vnc
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	${PORTNAME}
 PYDISTUTILS_PKGVERSION=	${PORTVERSION}
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/deskutils/vnc2flv/pkg-plist b/deskutils/vnc2flv/pkg-plist
deleted file mode 100644
index 197cd5ebd562..000000000000
--- a/deskutils/vnc2flv/pkg-plist
+++ /dev/null
@@ -1,26 +0,0 @@
-bin/flvaddmp3.py
-bin/flvcat.py
-bin/flvdump.py
-bin/flvrec.py
-bin/flvsplit.py
-bin/recordwin.sh
-%%PYTHON_SITELIBDIR%%/flvscreen.so
-%%PYTHON_SITELIBDIR%%/vnc2flv/__init__.py
-%%PYTHON_SITELIBDIR%%/vnc2flv/__init__.pyc
-%%PYTHON_SITELIBDIR%%/vnc2flv/__init__.pyo
-%%PYTHON_SITELIBDIR%%/vnc2flv/audio.py
-%%PYTHON_SITELIBDIR%%/vnc2flv/audio.pyc
-%%PYTHON_SITELIBDIR%%/vnc2flv/audio.pyo
-%%PYTHON_SITELIBDIR%%/vnc2flv/d3des.py
-%%PYTHON_SITELIBDIR%%/vnc2flv/d3des.pyc
-%%PYTHON_SITELIBDIR%%/vnc2flv/d3des.pyo
-%%PYTHON_SITELIBDIR%%/vnc2flv/flv.py
-%%PYTHON_SITELIBDIR%%/vnc2flv/flv.pyc
-%%PYTHON_SITELIBDIR%%/vnc2flv/flv.pyo
-%%PYTHON_SITELIBDIR%%/vnc2flv/rfb.py
-%%PYTHON_SITELIBDIR%%/vnc2flv/rfb.pyc
-%%PYTHON_SITELIBDIR%%/vnc2flv/rfb.pyo
-%%PYTHON_SITELIBDIR%%/vnc2flv/video.py
-%%PYTHON_SITELIBDIR%%/vnc2flv/video.pyc
-%%PYTHON_SITELIBDIR%%/vnc2flv/video.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/vnc2flv