Index: head/x11/p5-X11-GUITest/Makefile
===================================================================
--- head/x11/p5-X11-GUITest/Makefile	(revision 333059)
+++ head/x11/p5-X11-GUITest/Makefile	(revision 333060)
@@ -1,24 +1,21 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	X11-GUITest
 PORTVERSION=	0.25
 CATEGORIES=	x11 perl5
 MASTER_SITES=	CPAN \
 		SF/x11guitest/x11guitest/${PORTVERSION}
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Provides GUI testing/interaction facilities
 
 USE_XORG=	x11 xt xext xtst
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		X11::GUITest.3
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/X11R6/\([a-z]*\)\(64\)*|${LOCALBASE}/\1|' ${WRKSRC}/Makefile.PL
 
 .include <bsd.port.mk>
Index: head/x11/p5-X11-GUITest/pkg-plist
===================================================================
--- head/x11/p5-X11-GUITest/pkg-plist	(revision 333059)
+++ head/x11/p5-X11-GUITest/pkg-plist	(revision 333060)
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/X11::GUITest.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/X11/GUITest.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/X11
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/GUITest/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/GUITest/GUITest.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/GUITest/GUITest.bs
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/GUITest
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/X11
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/GUITest/GUITest.so
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/GUITest
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/X11
Index: head/x11/p5-X11-Protocol/Makefile
===================================================================
--- head/x11/p5-X11-Protocol/Makefile	(revision 333059)
+++ head/x11/p5-X11-Protocol/Makefile	(revision 333060)
@@ -1,34 +1,16 @@
 # Created by: will
 # $FreeBSD$
 
 PORTNAME=	X11-Protocol
 PORTVERSION=	0.56
 CATEGORIES=	x11 perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl module that provides an interface roughly equivalent to Xlib
 
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		X11::Auth.3 \
-		X11::Keysyms.3 \
-		X11::Protocol.3 \
-		X11::Protocol::Connection.3 \
-		X11::Protocol::Connection::Socket.3 \
-		X11::Protocol::Connection::FileHandle.3 \
-		X11::Protocol::Connection::INETFH.3 \
-		X11::Protocol::Connection::INETSocket.3 \
-		X11::Protocol::Connection::UNIXFH.3 \
-		X11::Protocol::Connection::UNIXSocket.3 \
-		X11::Protocol::Ext::BIG_REQUESTS.3 \
-		X11::Protocol::Ext::DPMS.3 \
-		X11::Protocol::Ext::RENDER.3 \
-		X11::Protocol::Ext::SHAPE.3 \
-		X11::Protocol::Ext::XC_MISC.3 \
-		X11::Protocol::Ext::XFree86_Misc.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: head/x11/p5-X11-Protocol/pkg-plist
===================================================================
--- head/x11/p5-X11-Protocol/pkg-plist	(revision 333059)
+++ head/x11/p5-X11-Protocol/pkg-plist	(revision 333060)
@@ -1,24 +1,40 @@
+%%PERL5_MAN3%%/X11::Auth.3.gz
+%%PERL5_MAN3%%/X11::Keysyms.3.gz
+%%PERL5_MAN3%%/X11::Protocol.3.gz
+%%PERL5_MAN3%%/X11::Protocol::Connection.3.gz
+%%PERL5_MAN3%%/X11::Protocol::Connection::FileHandle.3.gz
+%%PERL5_MAN3%%/X11::Protocol::Connection::INETFH.3.gz
+%%PERL5_MAN3%%/X11::Protocol::Connection::INETSocket.3.gz
+%%PERL5_MAN3%%/X11::Protocol::Connection::Socket.3.gz
+%%PERL5_MAN3%%/X11::Protocol::Connection::UNIXFH.3.gz
+%%PERL5_MAN3%%/X11::Protocol::Connection::UNIXSocket.3.gz
+%%PERL5_MAN3%%/X11::Protocol::Ext::BIG_REQUESTS.3.gz
+%%PERL5_MAN3%%/X11::Protocol::Ext::DPMS.3.gz
+%%PERL5_MAN3%%/X11::Protocol::Ext::RENDER.3.gz
+%%PERL5_MAN3%%/X11::Protocol::Ext::SHAPE.3.gz
+%%PERL5_MAN3%%/X11::Protocol::Ext::XC_MISC.3.gz
+%%PERL5_MAN3%%/X11::Protocol::Ext::XFree86_Misc.3.gz
 %%SITE_PERL%%/X11/Auth.pm
 %%SITE_PERL%%/X11/Keysyms.pm
 %%SITE_PERL%%/X11/Protocol.pm
 %%SITE_PERL%%/X11/Protocol/Connection.pm
-%%SITE_PERL%%/X11/Protocol/Constants.pm
 %%SITE_PERL%%/X11/Protocol/Connection/FileHandle.pm
 %%SITE_PERL%%/X11/Protocol/Connection/INETFH.pm
 %%SITE_PERL%%/X11/Protocol/Connection/INETSocket.pm
 %%SITE_PERL%%/X11/Protocol/Connection/Socket.pm
 %%SITE_PERL%%/X11/Protocol/Connection/UNIXFH.pm
 %%SITE_PERL%%/X11/Protocol/Connection/UNIXSocket.pm
+%%SITE_PERL%%/X11/Protocol/Constants.pm
 %%SITE_PERL%%/X11/Protocol/Ext/BIG_REQUESTS.pm
 %%SITE_PERL%%/X11/Protocol/Ext/DPMS.pm
 %%SITE_PERL%%/X11/Protocol/Ext/RENDER.pm
 %%SITE_PERL%%/X11/Protocol/Ext/SHAPE.pm
 %%SITE_PERL%%/X11/Protocol/Ext/XC_MISC.pm
 %%SITE_PERL%%/X11/Protocol/Ext/XFree86_Misc.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/Protocol/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/Protocol
-@dirrm %%SITE_PERL%%/X11/Protocol/Ext
-@dirrm %%SITE_PERL%%/X11/Protocol/Connection
-@dirrm %%SITE_PERL%%/X11/Protocol
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/Protocol
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11
+@dirrmtry %%SITE_PERL%%/X11/Protocol/Ext
+@dirrmtry %%SITE_PERL%%/X11/Protocol/Connection
+@dirrmtry %%SITE_PERL%%/X11/Protocol
 @dirrmtry %%SITE_PERL%%/X11