Index: Makefile
===================================================================
--- Makefile	(revision 310127)
+++ Makefile	(working copy)
@@ -2,36 +2,37 @@
 # $FreeBSD$
 
 PORTNAME=	pax-utils
-PORTVERSION=	0.5
+PORTVERSION=	0.6
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GENTOO} \
 		http://dev.gentoo.org/~vapier/dist/ \
-		LOCAL/sbz
+		LOCAL/${MAINTAINER:C/([^@]*)@.*/\1/}
 MASTER_SITE_SUBDIR=	distfiles
 
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Various ELF related utils for ELF32, ELF64 binaries
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_XZ=		true
 USE_GMAKE=	true
 
 PLIST_FILES=	bin/dumpelf bin/pspax bin/scanelf bin/scanmacho
 
+MAN1=		dumpelf.1 pspax.1 scanelf.1 scanmacho.1
+
+OPTIONS_DEFINE=	DOCS
+
 PORTDOCS=	BUGS README TODO
 
-MAN1=		dumpelf.1 pspax.1 scanelf.1 scanmacho.1
+.include <bsd.port.options.mk>
 
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} < 800076
 BROKEN=	Does not build
 .endif
 
 do-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
 .endif
@@ -40,4 +41,4 @@
 .endfor
 	${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/man/,} ${PREFIX}/man/man1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 310127)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (pax-utils-0.5.tar.xz) = 1ba4f5e8680449c18841db2397aca320527fb06628b4ad9212e42f5e01de833b
-SIZE (pax-utils-0.5.tar.xz) = 80672
+SHA256 (pax-utils-0.6.tar.xz) = 1ffd4bf7bf3f8bb404007dd1617edfb0297e4c65a2c1153712e4a76875038784
+SIZE (pax-utils-0.6.tar.xz) = 87548