diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2019-07-07 08:54:30 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2019-07-07 08:54:30 +0000 |
| commit | 2f27ce0375909fe17654160c5de2389a7034496e (patch) | |
| tree | b6f6afbe51ac7b3336a3546f327bd7b42b8b29db | |
| parent | f7e03e42194e1e7109a2d1648c5519763f19abec (diff) | |
| download | pkgsrc-2f27ce0375909fe17654160c5de2389a7034496e.tar.gz | |
gcpio: Fix Darwin and Interix builds.
- disable rmt on Darwin
- correctly put in variables to PLIST
Patch from Clement Bouvier in PR pkg/54354.
| -rw-r--r-- | archivers/gcpio/Makefile | 4 | ||||
| -rw-r--r-- | archivers/gcpio/PLIST | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile index 23a52f62c99..9b1acbbe52a 100644 --- a/archivers/gcpio/Makefile +++ b/archivers/gcpio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2016/09/18 11:20:14 wiz Exp $ +# $NetBSD: Makefile,v 1.52 2019/07/07 08:54:30 bsiegert Exp $ DISTNAME= cpio-2.12 PKGNAME= g${DISTNAME} @@ -32,11 +32,11 @@ PLIST_VARS+= rmt .include "../../mk/bsd.prefs.mk" # don't include rmt if gtar won't build it +# macOS does not support rmt driver, so it won't be built .if ${OPSYS} != "Interix" && ${OPSYS} != "Darwin" PLIST.rmt= yes .endif -.include "../../mk/bsd.prefs.mk" post-install: ${LN} -sf ${PREFIX}/bin/gcpio ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/cpio diff --git a/archivers/gcpio/PLIST b/archivers/gcpio/PLIST index 2fd56a814b0..0aa0d377c77 100644 --- a/archivers/gcpio/PLIST +++ b/archivers/gcpio/PLIST @@ -1,12 +1,12 @@ -@comment $NetBSD: PLIST,v 1.16 2016/09/18 11:20:14 wiz Exp $ +@comment $NetBSD: PLIST,v 1.17 2019/07/07 08:54:30 bsiegert Exp $ bin/gcpio gnu/bin/cpio gnu/man/man1/cpio.1 gnu/man/man1/mt.1 info/cpio.info -libexec/grmt +${PLIST.rmt}libexec/grmt man/man1/gcpio.1 -man/man8/grmt.8 +${PLIST.rmt}man/man8/grmt.8 share/locale/da/LC_MESSAGES/cpio.mo share/locale/de/LC_MESSAGES/cpio.mo share/locale/es/LC_MESSAGES/cpio.mo |