Tue Apr 29 22:03:19 2008 UTC ()
Make the --binary-macpkg option compatible with the other binary-kit options.


(minskim)
diff -r1.121 -r1.122 pkgsrc/bootstrap/bootstrap
cvs diff -r1.121 -r1.122 pkgsrc/bootstrap/bootstrap (expand / switch to unified diff)

--- pkgsrc/bootstrap/bootstrap 2008/03/06 04:45:58 1.121
+++ pkgsrc/bootstrap/bootstrap 2008/04/29 22:03:19 1.122
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# $NetBSD: bootstrap,v 1.121 2008/03/06 04:45:58 jlam Exp $ 3# $NetBSD: bootstrap,v 1.122 2008/04/29 22:03:19 minskim Exp $
4# 4#
5# 5#
6# Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved. 6# Copyright (c) 2001-2002 Alistair G. Crooks. 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# 3. All advertising materials mentioning features or use of this software 16# 3. All advertising materials mentioning features or use of this software
@@ -375,28 +375,30 @@ while [ $# -gt 0 ]; do @@ -375,28 +375,30 @@ while [ $# -gt 0 ]; do
375 --mk-fragment=*) 375 --mk-fragment=*)
376 mk_fragment=`get_optarg "$1"` ;; 376 mk_fragment=`get_optarg "$1"` ;;
377 --mk-fragment) 377 --mk-fragment)
378 mk_fragment="$2"; shift ;; 378 mk_fragment="$2"; shift ;;
379 379
380 --binary-kit=*) 380 --binary-kit=*)
381 binary_kit=`get_optarg "$1"` ;; 381 binary_kit=`get_optarg "$1"` ;;
382 --binary-kit) 382 --binary-kit)
383 binary_kit="$2"; shift ;; 383 binary_kit="$2"; shift ;;
384 --gzip-binary-kit=*) 384 --gzip-binary-kit=*)
385 binary_gzip_kit=`get_optarg "$1"` ;; 385 binary_gzip_kit=`get_optarg "$1"` ;;
386 --gzip-binary-kit) 386 --gzip-binary-kit)
387 binary_gzip_kit="$2"; shift ;; 387 binary_gzip_kit="$2"; shift ;;
388 --binary-macpkg) 388 --binary-macpkg=*)
389 binary_macpkg=`get_optarg "$1"` ;; 389 binary_macpkg=`get_optarg "$1"` ;;
 390 --binary-macpkg)
 391 binary_macpkg="$2"; shift ;;
390 --full) full=yes ;; 392 --full) full=yes ;;
391 --quiet) quiet=yes ;; 393 --quiet) quiet=yes ;;
392 --help) echo "$usage"; exit ;; 394 --help) echo "$usage"; exit ;;
393 -h) echo "$usage"; exit ;; 395 -h) echo "$usage"; exit ;;
394 --*) echo "$usage"; exit 1 ;; 396 --*) echo "$usage"; exit 1 ;;
395 esac 397 esac
396 shift 398 shift
397done 399done
398 400
399checkarg_sane_absolute_path "$wrkdir" "--workdir" 401checkarg_sane_absolute_path "$wrkdir" "--workdir"
400checkarg_sane_absolute_path "$prefix" "--prefix" 402checkarg_sane_absolute_path "$prefix" "--prefix"
401checkarg_sane_absolute_path "$pkgdbdir" "--pkgdbdir" 403checkarg_sane_absolute_path "$pkgdbdir" "--pkgdbdir"
402checkarg_sane_absolute_path "$sysconfdir" "--sysconfdir" 404checkarg_sane_absolute_path "$sysconfdir" "--sysconfdir"