pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wip/doas: Apply changes from PR pkg/54483 with small adjustments.
Module Name: pkgsrc-wip
Committed By: ng0 <ng0%NetBSD.org@localhost>
Pushed By: ng0
Date: Wed Aug 21 08:34:04 2019 +0000
Changeset: b2e6c11fb4a2e7d1bdbfc61cfd3fe9b4f49ffc28
Modified Files:
doas/Makefile
doas/distinfo
Removed Files:
doas/patches/patch-Makefile
Log Message:
wip/doas: Apply changes from PR pkg/54483 with small adjustments.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b2e6c11fb4a2e7d1bdbfc61cfd3fe9b4f49ffc28
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 | 1 -
doas/patches/patch-Makefile | 28 ----------------------------
3 files changed, 17 insertions(+), 36 deletions(-)
diffs:
diff --git a/doas/Makefile b/doas/Makefile
index 091a826466..ae5b88866d 100644
--- a/doas/Makefile
+++ b/doas/Makefile
@@ -2,21 +2,31 @@
GITHUB_PROJECT= doas
DISTNAME= 6.1
-PKGNAME= doas-6.1
-CATEGORIES= sysutils
+PKGNAME= ${GITHUB_PROJECT}-${DISTNAME}
+CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GITHUB:=slicer69/}
DIST_SUBDIR= ${GITHUB_PROJECT}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://github.com/slicer69/doas/
-COMMENT= Allow others to run commands as root
+COMMENT= Execute commands as another user
LICENSE= 2-clause-bsd
-USE_TOOLS+= gmake
+WRKSRC= ${WRKDIR}/doas-6.1
+
+ONLY_FOR_PLATFORM+= NetBSD-*-*
+ONLY_FOR_PLATFORM+= FreeBSD-*-*
+ONLY_FOR_PLATFORM+= Linux-*-*
-WRKSRC= ${WRKDIR}/doas-6.1
+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'
-#INSTALL_MAKE_FLAGS+= PREFIX=${PREFIX:Q}
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
+
+USE_TOOLS+= gmake
-.include "../../mk/pam.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/doas/distinfo b/doas/distinfo
index 159274f9d7..371f9d437e 100644
--- a/doas/distinfo
+++ b/doas/distinfo
@@ -4,4 +4,3 @@ 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 (patch-Makefile) = 4bb9619488b35259f6efb85d5897ccceb015d455
diff --git a/doas/patches/patch-Makefile b/doas/patches/patch-Makefile
deleted file mode 100644
index 6d6c5ed43b..0000000000
--- a/doas/patches/patch-Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-Fix the pkgsrc build, without this the application attempts
-to install to $PREFIX directly.
-
---- Makefile~ 2019-08-20 15:41:02.216585049 +0000
-+++ Makefile 2019-08-20 15:43:46.000655016 +0000
-@@ -34,13 +34,13 @@
- $(CC) $(CFLAGS) -c y.tab.c
-
- install: $(BIN)
-- mkdir -p $(PREFIX)/bin
-- cp $(BIN) $(PREFIX)/bin/
-- chmod 4755 $(PREFIX)/bin/$(BIN)
-- mkdir -p $(PREFIX)/man/man1
-- cp doas.1 $(PREFIX)/man/man1/
-- mkdir -p $(PREFIX)/man/man5
-- cp doas.conf.5 $(PREFIX)/man/man5/
-+ mkdir -p $(DESTDIR)$(PREFIX)/bin
-+ cp $(BIN) $(DESTDIR)$(PREFIX)/bin/
-+ chmod 4755 $(DESTDIR)$(PREFIX)/bin/$(BIN)
-+ mkdir -p $(DESTDIR)$(PREFIX)/man/man1
-+ cp doas.1 $(DESTDIR)$(PREFIX)/man/man1/
-+ mkdir -p $(DESTDIR)$(PREFIX)/man/man5
-+ cp doas.conf.5 $(DESTDIR)$(PREFIX)/man/man5/
-
- clean:
- rm -f $(BIN) $(OBJECTS) y.tab.c
Home |
Main Index |
Thread Index |
Old Index