Tue Apr 14 08:55:07 2015 UTC ()
Update to mksandbox-1.4.  Changes:

 - Only copy $kernel if it exists, fixes warning on OSX 10.10 which moves
   the kernel location to a directory we already mount, noted by J. Lewis
   Muir on pkgsrc-users.

 - Add NO_CHECKSUM=yes to appease pkglint.


(jperkin)
diff -r1.8 -r1.9 pkgsrc/pkgtools/mksandbox/Makefile
diff -r1.6 -r1.7 pkgsrc/pkgtools/mksandbox/files/mksandbox
cvs diff -r1.8 -r1.9 pkgsrc/pkgtools/mksandbox/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/mksandbox/Makefile 2014/03/03 03:30:53 1.8
+++ pkgsrc/pkgtools/mksandbox/Makefile 2015/04/14 08:55:07 1.9
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1# $NetBSD: Makefile,v 1.8 2014/03/03 03:30:53 obache Exp $ 1# $NetBSD: Makefile,v 1.9 2015/04/14 08:55:07 jperkin Exp $
2 2
3PKGNAME= mksandbox-1.3 3PKGNAME= mksandbox-1.4
4CATEGORIES= pkgtools 4CATEGORIES= pkgtools
5 5
6MAINTAINER= agc@NetBSD.org 6MAINTAINER= agc@NetBSD.org
7HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/bulk.html#setting-up-a-sandbox 7HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/bulk.html#setting-up-a-sandbox
8COMMENT= Tool for creating sandboxes 8COMMENT= Tool for creating sandboxes
9LICENSE= 2-clause-bsd 9LICENSE= 2-clause-bsd
10 10
11WRKSRC= ${WRKDIR} 11WRKSRC= ${WRKDIR}
12NO_BUILD= yes 12NO_BUILD= yes
 13NO_CHECKSUM= yes
13USE_LANGUAGES= # none 14USE_LANGUAGES= # none
14INSTALLATION_DIRS= sbin ${PKGMANDIR}/man8 15INSTALLATION_DIRS= sbin ${PKGMANDIR}/man8
15 16
16do-extract: 17do-extract:
17 cd ${FILESDIR} && cp mksandbox mksandbox.8 ${WRKSRC}/ 18 cd ${FILESDIR} && cp mksandbox mksandbox.8 ${WRKSRC}/
18 19
19.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
20 21
21SUBST_CLASSES+= up 22SUBST_CLASSES+= up
22SUBST_STAGE.up= do-configure 23SUBST_STAGE.up= do-configure
23SUBST_FILES.up= mksandbox mksandbox.8 24SUBST_FILES.up= mksandbox mksandbox.8
24SUBST_SED.up+= -e 's,/usr/pkgsrc,${PKGSRCDIR},g' 25SUBST_SED.up+= -e 's,/usr/pkgsrc,${PKGSRCDIR},g'
25 26
cvs diff -r1.6 -r1.7 pkgsrc/pkgtools/mksandbox/files/mksandbox (expand / switch to unified diff)

--- pkgsrc/pkgtools/mksandbox/files/mksandbox 2013/07/24 22:16:26 1.6
+++ pkgsrc/pkgtools/mksandbox/files/mksandbox 2015/04/14 08:55:07 1.7
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# $NetBSD: mksandbox,v 1.6 2013/07/24 22:16:26 jperkin Exp $ 3# $NetBSD: mksandbox,v 1.7 2015/04/14 08:55:07 jperkin Exp $
4 4
5# Copyright (c) 2002,2012 Alistair Crooks <agc@NetBSD.org> 5# Copyright (c) 2002,2012 Alistair Crooks <agc@NetBSD.org>
6# All rights reserved. 6# All rights reserved.
7# 7#
8# Redistribution and use in source and binary forms, with or without 8# Redistribution and use in source and binary forms, with or without
9# modification, are permitted provided that the following conditions 9# modification, are permitted provided that the following conditions
10# are met: 10# are met:
11# 1. Redistributions of source code must retain the above copyright 11# 1. Redistributions of source code must retain the above copyright
12# notice, this list of conditions and the following disclaimer. 12# notice, this list of conditions and the following disclaimer.
13# 2. Redistributions in binary form must reproduce the above copyright 13# 2. Redistributions in binary form must reproduce the above copyright
14# notice, this list of conditions and the following disclaimer in the 14# notice, this list of conditions and the following disclaimer in the
15# documentation and/or other materials provided with the distribution. 15# documentation and/or other materials provided with the distribution.
16# 16#
@@ -237,27 +237,27 @@ sandbox=$sandbox @@ -237,27 +237,27 @@ sandbox=$sandbox
237r3() { 237r3() {
238 _R= 238 _R=
239 while [ \$# -ge 3 ] 239 while [ \$# -ge 3 ]
240 do 240 do
241 _R="\$1 \$2 \$3 \$_R" 241 _R="\$1 \$2 \$3 \$_R"
242 shift; shift; shift 242 shift; shift; shift
243 done 243 done
244 echo "\$_R" 244 echo "\$_R"
245} 245}
246 246
247fses="\\ 247fses="\\
248EOS 248EOS
249 249
250if [ ! -z "$kernel" ]; then 250if [ -n "$kernel" -a -f "$kernel" ]; then
251 echo "Copying the kernel" 251 echo "Copying the kernel"
252 $cpprog $kernel $sandbox 252 $cpprog $kernel $sandbox
253fi 253fi
254 254
255if [ "$with_pkgsrc" = "yes" ]; then 255if [ "$with_pkgsrc" = "yes" ]; then
256 echo "Checking package hierarchy in $localbase and package database in $pkg_dbdir exist" 256 echo "Checking package hierarchy in $localbase and package database in $pkg_dbdir exist"
257 $mkdirprog $sandbox/$localbase $sandbox/$pkg_dbdir 257 $mkdirprog $sandbox/$localbase $sandbox/$pkg_dbdir
258fi 258fi
259 259
260echo "Make and populate $sandbox/dev" 260echo "Make and populate $sandbox/dev"
261$mkdirprog $sandbox/dev 261$mkdirprog $sandbox/dev
262 262
263case "$opsys" in 263case "$opsys" in