Index: branches/2019Q3/security/doas/Makefile
===================================================================
--- branches/2019Q3/security/doas/Makefile	(revision 508147)
+++ branches/2019Q3/security/doas/Makefile	(revision 508148)
@@ -1,33 +1,42 @@
 # $FreeBSD$
 
 PORTNAME=	doas
-PORTVERSION=	6.0p3
+PORTVERSION=	6.1
 CATEGORIES=	security
 
 MAINTAINER=	jsmith@resonatingmedia.com
 COMMENT=	Simple sudo alternative to run commands as another user
 
 LICENSE=	BSD2CLAUSE ISCL
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD2CLAUSE=	${WRKSRC}/LICENSE
 LICENSE_FILE_ISCL=		${WRKSRC}/LICENSE
 
+USES=	gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	slicer69
-GH_PROJECT=	doas
 
-USES=	gmake
+MAKE_ENV+=	TARGETPATH=-DGLOBAL_PATH='\"${_GLOBAL_PATH}\"'
 
 BINMODE=	4755
 
 SUB_FILES=	pkg-message
 PLIST_FILES=	bin/doas \
 		man/man5/doas.conf.5.gz \
 		man/man1/doas.1.gz
+
+# These are upstream's default paths that are set for the GLOBAL_PATH variable
+# in doas.h since the 6.1 release. Those paths are then used for target user's
+# PATH variable instead of those of the original user.
+#
+# See also:
+#  * https://github.com/slicer69/doas/blob/6.1/doas.h#L36
+#  * https://github.com/slicer69/doas/releases/tag/6.1
+_GLOBAL_PATH?=	${LOCALBASE}/sbin:${LOCALBASE}/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doas.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doas.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
 
 .include <bsd.port.mk>
Index: branches/2019Q3/security/doas/distinfo
===================================================================
--- branches/2019Q3/security/doas/distinfo	(revision 508147)
+++ branches/2019Q3/security/doas/distinfo	(revision 508148)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1552317435
-SHA256 (slicer69-doas-6.0p3_GH0.tar.gz) = abf7911df661fd82acc3ff71724b73cf0f2102f8a5379153a1c031b285ed8c97
-SIZE (slicer69-doas-6.0p3_GH0.tar.gz) = 18470
+TIMESTAMP = 1564865652
+SHA256 (slicer69-doas-6.1_GH0.tar.gz) = f6ae5243a711774cd46d5087c544e7feead7e138c6053c030c47489a722033f2
+SIZE (slicer69-doas-6.1_GH0.tar.gz) = 19965
Index: branches/2019Q3/security/doas/files/pkg-message.in
===================================================================
--- branches/2019Q3/security/doas/files/pkg-message.in	(revision 508147)
+++ branches/2019Q3/security/doas/files/pkg-message.in	(revision 508148)
@@ -1,9 +1,31 @@
-============================================================
+[
+{ type: install
+  message: <<EOD
 To use doas,
 
 %%PREFIX%%/etc/doas.conf
 
-must be created.
+must be created. Refer to doas.conf(5) for further details.
 
-Refer to doas.conf(5).
-============================================================
+Note: In order to be able to run most desktop (GUI) applications, the user
+needs to have the keepenv keyword specified. If keepenv is not specified then
+key elements, like the user's $HOME variable, will be reset and cause the GUI
+application to crash.
+
+Users who only need to run command line applications can usually get away
+without keepenv.
+
+When in doubt, try to avoid using keepenv as it is less secure to have
+environment variables passed to privileged users.
+EOD
+}
+{ type: upgrade
+  maximum_version: "6.1"
+  message: <<EOD
+With the 6.1 release the transfer of most environment variables (e.g. USER,
+HOME and PATH) from the original user to the target user has changed.
+
+Please refer to doas.conf(5) for further details.
+EOD
+}
+]
Index: branches/2019Q3
===================================================================
--- branches/2019Q3	(revision 508147)
+++ branches/2019Q3	(revision 508148)

Property changes on: branches/2019Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r506905,508097