Mon Feb 10 10:43:02 2014 UTC ()
Fix usage of build_package


(ryoon)
diff -r1.200 -r1.201 pkgsrc/bootstrap/bootstrap
cvs diff -r1.200 -r1.201 pkgsrc/bootstrap/bootstrap (expand / switch to unified diff)

--- pkgsrc/bootstrap/bootstrap 2013/10/03 01:24:57 1.200
+++ pkgsrc/bootstrap/bootstrap 2014/02/10 10:43:02 1.201
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# $NetBSD: bootstrap,v 1.200 2013/10/03 01:24:57 joerg Exp $ 3# $NetBSD: bootstrap,v 1.201 2014/02/10 10:43:02 ryoon Exp $
4# 4#
5# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> 5# Copyright (c) 2001-2011 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#
@@ -1166,28 +1166,28 @@ fi @@ -1166,28 +1166,28 @@ fi
1166opsys_finish 1166opsys_finish
1167 1167
1168echo "WRKOBJDIR= ${wrkdir}/wrk" >> ${BOOTSTRAP_MKCONF} 1168echo "WRKOBJDIR= ${wrkdir}/wrk" >> ${BOOTSTRAP_MKCONF}
1169 1169
1170echo "" >> ${TARGET_MKCONF} 1170echo "" >> ${TARGET_MKCONF}
1171echo "" >> ${BOOTSTRAP_MKCONF} 1171echo "" >> ${BOOTSTRAP_MKCONF}
1172if test -n "${mk_fragment}"; then 1172if test -n "${mk_fragment}"; then
1173 cat "${mk_fragment}" >> ${TARGET_MKCONF} 1173 cat "${mk_fragment}" >> ${TARGET_MKCONF}
1174 echo "" >> ${TARGET_MKCONF} 1174 echo "" >> ${TARGET_MKCONF}
1175fi 1175fi
1176echo ".endif # end pkgsrc settings" >> ${TARGET_MKCONF} 1176echo ".endif # end pkgsrc settings" >> ${TARGET_MKCONF}
1177echo ".endif # end pkgsrc settings" >> ${BOOTSTRAP_MKCONF} 1177echo ".endif # end pkgsrc settings" >> ${BOOTSTRAP_MKCONF}
1178 1178
1179# register packages 1179# build and register packages
1180# usage: register_package <packagedirectory> [additional arguments] 1180# usage: build_package <packagedirectory> [additional arguments]
1181build_package() { 1181build_package() {
1182 run_cmd "(cd $pkgsrcdir/$1 && $bmake USE_DESTDIR=no -DPKG_PRESERVE MAKECONF=${BOOTSTRAP_MKCONF} install)" 1182 run_cmd "(cd $pkgsrcdir/$1 && $bmake USE_DESTDIR=no -DPKG_PRESERVE MAKECONF=${BOOTSTRAP_MKCONF} install)"
1183} 1183}
1184 1184
1185# 1185#
1186# Please make sure that the following packages and 1186# Please make sure that the following packages and
1187# only the following packages set BOOTSTRAP_PKG=yes. 1187# only the following packages set BOOTSTRAP_PKG=yes.
1188# 1188#
1189echo_msg "Installing packages" 1189echo_msg "Installing packages"
1190build_package "pkgtools/bootstrap-mk-files" 1190build_package "pkgtools/bootstrap-mk-files"
1191case "$need_bsd_install" in 1191case "$need_bsd_install" in
1192yes) 1192yes)
1193 if [ "$use_bsdinstall" = "yes" ]; then 1193 if [ "$use_bsdinstall" = "yes" ]; then