Wed Jun 22 08:07:11 2016 UTC ()
Disable maintainer mode here as well.


(joerg)
diff -r1.230 -r1.231 pkgsrc/bootstrap/bootstrap
cvs diff -r1.230 -r1.231 pkgsrc/bootstrap/bootstrap (expand / switch to unified diff)

--- pkgsrc/bootstrap/bootstrap 2016/04/10 16:18:45 1.230
+++ pkgsrc/bootstrap/bootstrap 2016/06/22 08:07:11 1.231
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# $NetBSD: bootstrap,v 1.230 2016/04/10 16:18:45 joerg Exp $ 3# $NetBSD: bootstrap,v 1.231 2016/06/22 08:07:11 joerg 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#
@@ -1196,27 +1196,28 @@ echo_msg "Bootstrapping pkgtools" @@ -1196,27 +1196,28 @@ echo_msg "Bootstrapping pkgtools"
1196copy_src $pkgsrcdir/archivers/libarchive/files libarchive 1196copy_src $pkgsrcdir/archivers/libarchive/files libarchive
1197run_cmd "(cd $wrkdir/libarchive; env $BSTRAP_ENV \ 1197run_cmd "(cd $wrkdir/libarchive; env $BSTRAP_ENV \
1198$shprog ./configure $configure_quiet_flags --enable-static --disable-shared \ 1198$shprog ./configure $configure_quiet_flags --enable-static --disable-shared \
1199--disable-bsdtar --disable-bsdcpio --disable-posix-regex-lib --disable-xattr \ 1199--disable-bsdtar --disable-bsdcpio --disable-posix-regex-lib --disable-xattr \
1200--disable-acl --without-zlib --without-bz2lib --without-lzmadec \ 1200--disable-acl --without-zlib --without-bz2lib --without-lzmadec \
1201--without-iconv --without-lzma --without-lzo2 --without-nettle \ 1201--without-iconv --without-lzma --without-lzo2 --without-nettle \
1202--without-openssl --without-xml2 --without-expat MAKE=$bmake && $bmake $make_quiet_flags -j$make_jobs)" 1202--without-openssl --without-xml2 --without-expat MAKE=$bmake && $bmake $make_quiet_flags -j$make_jobs)"
1203copy_src $pkgsrcdir/pkgtools/pkg_install/files pkg_install 1203copy_src $pkgsrcdir/pkgtools/pkg_install/files pkg_install
1204run_cmd "(cd $wrkdir/pkg_install; env $BSTRAP_ENV \ 1204run_cmd "(cd $wrkdir/pkg_install; env $BSTRAP_ENV \
1205CPPFLAGS='$CPPFLAGS -I${wrkdir}/libnbcompat -I${wrkdir}/libarchive/libarchive' \ 1205CPPFLAGS='$CPPFLAGS -I${wrkdir}/libnbcompat -I${wrkdir}/libarchive/libarchive' \
1206LDFLAGS='$LDFLAGS -L${wrkdir}/libnbcompat' \ 1206LDFLAGS='$LDFLAGS -L${wrkdir}/libnbcompat' \
1207LIBS='$LIBS -lnbcompat' $shprog ./configure $configure_quiet_flags -C \ 1207LIBS='$LIBS -lnbcompat' $shprog ./configure $configure_quiet_flags -C \
1208--enable-bootstrap --prefix=$prefix --sysconfdir=$sysconfdir \ 1208--enable-bootstrap --prefix=$prefix --sysconfdir=$sysconfdir \
1209--with-pkgdbdir=$pkgdbdir --infodir=$infodir --mandir=$mandir $pkg_install_args && \ 1209--disable-maintainer-mode --with-pkgdbdir=$pkgdbdir --infodir=$infodir \
 1210--mandir=$mandir $pkg_install_args && \
1210STATIC_LIBARCHIVE=$wrkdir/libarchive/.libs/libarchive.a \ 1211STATIC_LIBARCHIVE=$wrkdir/libarchive/.libs/libarchive.a \
1211PKGSRC_MACHINE_ARCH="$machine_arch" $bmake $make_quiet_flags -j$make_jobs)" 1212PKGSRC_MACHINE_ARCH="$machine_arch" $bmake $make_quiet_flags -j$make_jobs)"
1212run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/add/pkg_add $wrkdir/sbin/pkg_add" 1213run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/add/pkg_add $wrkdir/sbin/pkg_add"
1213run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/admin/pkg_admin $wrkdir/sbin/pkg_admin" 1214run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/admin/pkg_admin $wrkdir/sbin/pkg_admin"
1214run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/create/pkg_create $wrkdir/sbin/pkg_create" 1215run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/create/pkg_create $wrkdir/sbin/pkg_create"
1215run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/info/pkg_info $wrkdir/sbin/pkg_info" 1216run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/info/pkg_info $wrkdir/sbin/pkg_info"
1216echo "PKG_ADD_CMD?= $wrkdir/sbin/pkg_add" >> ${BOOTSTRAP_MKCONF} 1217echo "PKG_ADD_CMD?= $wrkdir/sbin/pkg_add" >> ${BOOTSTRAP_MKCONF}
1217echo "PKG_ADMIN_CMD?= $wrkdir/sbin/pkg_admin" >> ${BOOTSTRAP_MKCONF} 1218echo "PKG_ADMIN_CMD?= $wrkdir/sbin/pkg_admin" >> ${BOOTSTRAP_MKCONF}
1218echo "PKG_CREATE_CMD?= $wrkdir/sbin/pkg_create" >> ${BOOTSTRAP_MKCONF} 1219echo "PKG_CREATE_CMD?= $wrkdir/sbin/pkg_create" >> ${BOOTSTRAP_MKCONF}
1219echo "PKG_INFO_CMD?= $wrkdir/sbin/pkg_info" >> ${BOOTSTRAP_MKCONF} 1220echo "PKG_INFO_CMD?= $wrkdir/sbin/pkg_info" >> ${BOOTSTRAP_MKCONF}
1220 1221
1221MAKECONF=$wrkdir/mk.conf 1222MAKECONF=$wrkdir/mk.conf
1222export MAKECONF 1223export MAKECONF