wip/doas: Apply new changes from pkg/54483 with fixes.

[ng0 <ng0%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	ng0 <ng0%NetBSD.org@localhost>
Pushed By:	ng0
Date:		Wed Aug 21 16:26:23 2019 +0000
Changeset:	711334a473bfffe196c1ac45d7c5acbcca211943

Modified Files:
	doas/Makefile
	doas/distinfo

Log Message:
wip/doas: Apply new changes from pkg/54483 with fixes.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=711334a473bfffe196c1ac45d7c5acbcca211943

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 doas/Makefile | 24 +++++++++++++-----------
 doas/distinfo |  8 ++++----
 2 files changed, 17 insertions(+), 15 deletions(-)

diffs:
diff --git a/doas/Makefile b/doas/Makefile
index ae5b88866d..c72bd0a503 100644
--- a/doas/Makefile
+++ b/doas/Makefile
@@ -1,11 +1,8 @@
 # $NetBSD$
 
-GITHUB_PROJECT=	doas
-DISTNAME=	6.1
-PKGNAME=	${GITHUB_PROJECT}-${DISTNAME}
+DISTNAME=	doas-6.1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GITHUB:=slicer69/}
-DIST_SUBDIR=	${GITHUB_PROJECT}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/slicer69/doas/
@@ -14,19 +11,24 @@ LICENSE=	2-clause-bsd
 
 WRKSRC=	${WRKDIR}/doas-6.1
 
+# Upstream supports only NetBSD, FreeBSD, and Linux.
 ONLY_FOR_PLATFORM+=	NetBSD-*-*
 ONLY_FOR_PLATFORM+=	FreeBSD-*-*
 ONLY_FOR_PLATFORM+=	Linux-*-*
 
-SUBST_CLASSES+= 	fix-paths
-SUBST_STAGE.fix-paths=	pre-install
+USE_TOOLS+=	gmake yacc
+
+SUBST_CLASSES+=			fix-paths
+SUBST_STAGE.fix-paths=		pre-install
 SUBST_MESSAGE.fix-paths=	Fixing paths.
-SUBST_FILES.fix-paths=	Makefile
-SUBST_SED.fix-paths=	-e 's,$$(PREFIX)/man,$$(PKGMANDIR),g'
-SUBST_SED.fix-paths=	-e 's,$$(PREFIX),$$(DESTDIR)$$(PREFIX),g'
+SUBST_FILES.fix-paths=		Makefile
+SUBST_SED.fix-paths+=		-e 's,$${PREFIX}/etc,${PKG_SYSCONFDIR},g'
+SUBST_SED.fix-paths+=		-e 's,$$(PREFIX),$$(DESTDIR)$$(PREFIX),g'
+SUBST_SED.fix-paths+=		-e 's,/man/,/${PKGMANDIR}/,g'
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
+SPECIAL_PERMS+=		bin/doas ${SETUID_ROOT_PERMS}
 
-USE_TOOLS+=	gmake
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 
+.include "../../mk/pam.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/doas/distinfo b/doas/distinfo
index 371f9d437e..1ff179d622 100644
--- a/doas/distinfo
+++ b/doas/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (doas/6.1.tar.gz) = d9363d1102a92f8a6276684e98c736f49d3d2bfd
-RMD160 (doas/6.1.tar.gz) = 62d5258e3e6beeb3afbe1b19eda6423106adcd6d
-SHA512 (doas/6.1.tar.gz) = 1397767416ec122170c0a07d0273473e019917c2555446865a5da45168fd81522c1d347ca5cd534ffbe74c5eb21b9f5817847260d8d37c91ffaf4b35ee992c2d
-Size (doas/6.1.tar.gz) = 19965 bytes
+SHA1 (doas-6.1.tar.gz) = d9363d1102a92f8a6276684e98c736f49d3d2bfd
+RMD160 (doas-6.1.tar.gz) = 62d5258e3e6beeb3afbe1b19eda6423106adcd6d
+SHA512 (doas-6.1.tar.gz) = 1397767416ec122170c0a07d0273473e019917c2555446865a5da45168fd81522c1d347ca5cd534ffbe74c5eb21b9f5817847260d8d37c91ffaf4b35ee992c2d
+Size (doas-6.1.tar.gz) = 19965 bytes