Index: head/security/doas/Makefile
===================================================================
--- head/security/doas/Makefile
+++ head/security/doas/Makefile
@@ -1,23 +1,24 @@
 # $FreeBSD$
 
 PORTNAME=	doas
-PORTVERSION=	5.9p7
+PORTVERSION=	6.0p0
 CATEGORIES=	security
 
 MAINTAINER=	jsmith@resonatingmedia.com
 COMMENT=	Simple sudo alternative to run commands as another user
 
-LICENSE=	ISCL
+LICENSE=	BSD2CLAUSE ISCL
+LICENSE_COMB=	multi
+LICENSE_FILE_BSD2CLAUSE=	${WRKSRC}/LICENSE
+LICENSE_FILE_ISCL=		${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	slicer69
 GH_PROJECT=	doas
-GH_TAGNAME=	a15e6ed
 
 USES=	gmake
 
 BINMODE=	4755
-ETCDIR=	${PREFIX}/etc
 
 SUB_FILES=	pkg-message
 PLIST_FILES=	bin/doas \
Index: head/security/doas/distinfo
===================================================================
--- head/security/doas/distinfo
+++ head/security/doas/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481094025
-SHA256 (slicer69-doas-5.9p7-a15e6ed_GH0.tar.gz) = dbc6da18619acb168e2951751e1431971d0ec11db1cd6bbfaed7c7f9e1f2557d
-SIZE (slicer69-doas-5.9p7-a15e6ed_GH0.tar.gz) = 15573
+TIMESTAMP = 1487632696
+SHA256 (slicer69-doas-6.0p0_GH0.tar.gz) = bb27019da7323728533de965b51a3cbf97d68eb8d53626bb2a626dcf05a24e84
+SIZE (slicer69-doas-6.0p0_GH0.tar.gz) = 16775
Index: head/security/doas/files/pkg-message.in
===================================================================
--- head/security/doas/files/pkg-message.in
+++ head/security/doas/files/pkg-message.in
@@ -1,7 +1,7 @@
 ============================================================
 To use doas,
 
-%%ETCDIR%%/doas.conf
+%%PREFIX%%/etc/doas.conf
 
 must be created.