CVS commit: pkgsrc/archivers/gcpio

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Jul  7 08:54:30 UTC 2019

Modified Files:
        pkgsrc/archivers/gcpio: Makefile PLIST

Log Message:
gcpio: Fix Darwin and Interix builds.

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

Patch from Clement Bouvier in PR pkg/54354.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/archivers/gcpio/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/archivers/gcpio/PLIST

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

Modified files:

Index: pkgsrc/archivers/gcpio/Makefile
diff -u pkgsrc/archivers/gcpio/Makefile:1.51 pkgsrc/archivers/gcpio/Makefile:1.52
--- pkgsrc/archivers/gcpio/Makefile:1.51        Sun Sep 18 11:20:14 2016
+++ pkgsrc/archivers/gcpio/Makefile     Sun Jul  7 08:54:30 2019
@@ -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

Index: pkgsrc/archivers/gcpio/PLIST
diff -u pkgsrc/archivers/gcpio/PLIST:1.16 pkgsrc/archivers/gcpio/PLIST:1.17
--- pkgsrc/archivers/gcpio/PLIST:1.16   Sun Sep 18 11:20:14 2016
+++ pkgsrc/archivers/gcpio/PLIST        Sun Jul  7 08:54:30 2019
@@ -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