pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/archivers/gcpio gcpio: Fix Darwin and Interix builds.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cff98e5285f3
branches:  trunk
changeset: 336095:cff98e5285f3
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sun Jul 07 08:54:30 2019 +0000

description:
gcpio: Fix Darwin and Interix builds.

- disable rmt on Darwin
- correctly put in variables to PLIST

Patch from Clement Bouvier in PR pkg/54354.

diffstat:

 archivers/gcpio/Makefile |  4 ++--
 archivers/gcpio/PLIST    |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r dc3d8555ae0b -r cff98e5285f3 archivers/gcpio/Makefile
--- a/archivers/gcpio/Makefile  Sun Jul 07 08:44:49 2019 +0000
+++ b/archivers/gcpio/Makefile  Sun Jul 07 08:54:30 2019 +0000
@@ -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 @@
 .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 -r dc3d8555ae0b -r cff98e5285f3 archivers/gcpio/PLIST
--- a/archivers/gcpio/PLIST     Sun Jul 07 08:44:49 2019 +0000
+++ b/archivers/gcpio/PLIST     Sun Jul 07 08:54:30 2019 +0000
@@ -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



Home | Main Index | Thread Index | Old Index