From owner-svn-src-user@FreeBSD.ORG Sat Jan 1 01:05:21 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 64031106566C; Sat, 1 Jan 2011 01:05:21 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5341E8FC0A; Sat, 1 Jan 2011 01:05:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0115L08093953; Sat, 1 Jan 2011 01:05:21 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0115L3A093946; Sat, 1 Jan 2011 01:05:21 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101010105.p0115L3A093946@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 1 Jan 2011 01:05:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216863 - in user/nwhitehorn/bsdinstall: libexec scripts X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 01:05:21 -0000 Author: nwhitehorn Date: Sat Jan 1 01:05:21 2011 New Revision: 216863 URL: http://svn.freebsd.org/changeset/base/216863 Log: Provide a little more functionality for the installed system, by allowing setting the root password, configuring user accounts, turning on ssh, etc. Added: user/nwhitehorn/bsdinstall/libexec/adduser (contents, props changed) user/nwhitehorn/bsdinstall/libexec/rootpass (contents, props changed) user/nwhitehorn/bsdinstall/scripts/adduser (contents, props changed) user/nwhitehorn/bsdinstall/scripts/rootpass (contents, props changed) Modified: user/nwhitehorn/bsdinstall/scripts/auto user/nwhitehorn/bsdinstall/scripts/config Added: user/nwhitehorn/bsdinstall/libexec/adduser ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/nwhitehorn/bsdinstall/libexec/adduser Sat Jan 1 01:05:21 2011 (r216863) @@ -0,0 +1 @@ +link ../scripts/adduser \ No newline at end of file Added: user/nwhitehorn/bsdinstall/libexec/rootpass ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/nwhitehorn/bsdinstall/libexec/rootpass Sat Jan 1 01:05:21 2011 (r216863) @@ -0,0 +1 @@ +link ../scripts/rootpass \ No newline at end of file Added: user/nwhitehorn/bsdinstall/scripts/adduser ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/nwhitehorn/bsdinstall/scripts/adduser Sat Jan 1 01:05:21 2011 (r216863) @@ -0,0 +1,13 @@ +#!/bin/sh + +cdialog --backtitle "FreeBSD Installer" --title "Add User Accounts" --yesno \ + "Would you like to add users to the installed system now?" 0 0 + +if [ $? -eq 0 ]; then + clear + echo "FreeBSD Installer" + echo "========================" + echo "Add Users" + echo + chroot $BSDINSTALL_CHROOT adduser +fi Modified: user/nwhitehorn/bsdinstall/scripts/auto ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/auto Sat Jan 1 00:20:14 2011 (r216862) +++ user/nwhitehorn/bsdinstall/scripts/auto Sat Jan 1 01:05:21 2011 (r216863) @@ -4,6 +4,7 @@ echo "Begun Installation at $(date)" > $ cdialog --backtitle "FreeBSD Installer" --title "Welcome" --msgbox "Welcome to the FreeBSD Installer." 0 0 +rm /tmp/rc.conf bsdinstall hostname FETCH_DISTRIBUTIONS="" @@ -19,7 +20,6 @@ if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then fi rm $PATH_FSTAB -rm /tmp/rc.conf bsdinstall partedit bsdinstall mount @@ -31,8 +31,9 @@ if [ ! -z $FETCH_DISTRIBUTIONS ]; then fi bsdinstall distextract +bsdinstall rootpass +bsdinstall adduser bsdinstall config -#bsdinstall rootpass cdialog --backtitle "FreeBSD Installer" --title "Welcome" --msgbox "Installation of FreeBSD complete!" 0 0 Modified: user/nwhitehorn/bsdinstall/scripts/config ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/config Sat Jan 1 00:20:14 2011 (r216862) +++ user/nwhitehorn/bsdinstall/scripts/config Sat Jan 1 01:05:21 2011 (r216863) @@ -1,5 +1,20 @@ #!/bin/sh +exec 3>&1 +DAEMONS=$(cdialog --backtitle "FreeBSD Installer" \ + --title "System Configuration" --nocancel --separate-output \ + --checklist "Choose the services you would like to be started at boot:" \ + 0 0 0 \ + sshd "Secure shell daemon" on \ + ntpd "Synchronize system and network time" off \ + powerd "Adjust CPU frequency dynamically" off \ +2>&1 1>&3) +exec 3>&- + +for daemon in $DAEMONS; do + echo ${daemon}_enable=\"YES\" >> /tmp/rc.conf +done + cp $PATH_FSTAB $BSDINSTALL_CHROOT/etc/fstab cp /tmp/rc.conf $BSDINSTALL_CHROOT/etc/rc.conf cp /tmp/resolv.conf $BSDINSTALL_CHROOT/etc/resolv.conf Added: user/nwhitehorn/bsdinstall/scripts/rootpass ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/nwhitehorn/bsdinstall/scripts/rootpass Sat Jan 1 01:05:21 2011 (r216863) @@ -0,0 +1,11 @@ +#!/bin/sh + +clear +echo "FreeBSD Installer" +echo "========================" +echo + +echo "Please select a password for the system management account (root):" + +chroot $BSDINSTALL_CHROOT passwd root + From owner-svn-src-user@FreeBSD.ORG Sat Jan 1 01:06:28 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D3B91065694; Sat, 1 Jan 2011 01:06:28 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3C36D8FC0A; Sat, 1 Jan 2011 01:06:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0116SAk094010; Sat, 1 Jan 2011 01:06:28 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0116SUK094004; Sat, 1 Jan 2011 01:06:28 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101010106.p0116SUK094004@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 1 Jan 2011 01:06:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216864 - in user/nwhitehorn/bsdinstall: distextract distfetch partedit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 01:06:28 -0000 Author: nwhitehorn Date: Sat Jan 1 01:06:27 2011 New Revision: 216864 URL: http://svn.freebsd.org/changeset/base/216864 Log: Fix build on powerpc and i386. Can now install a bootable system on powerpc that you can ssh into immediately after reboot, which sysinstall could never do. And that's it for 2010... Modified: user/nwhitehorn/bsdinstall/distextract/Makefile user/nwhitehorn/bsdinstall/distfetch/Makefile user/nwhitehorn/bsdinstall/distfetch/distfetch.c user/nwhitehorn/bsdinstall/partedit/Makefile user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Modified: user/nwhitehorn/bsdinstall/distextract/Makefile ============================================================================== --- user/nwhitehorn/bsdinstall/distextract/Makefile Sat Jan 1 01:05:21 2011 (r216863) +++ user/nwhitehorn/bsdinstall/distextract/Makefile Sat Jan 1 01:06:27 2011 (r216864) @@ -1,7 +1,7 @@ # $FreeBSD $ PROG= distextract -LDADD= -larchive -lncursesw -L/usr/local/lib -lcdialog +LDADD= -larchive -lncursesw -L/usr/local/lib -lcdialog -lm CFLAGS= -I/usr/local/include WARNS?= 6 Modified: user/nwhitehorn/bsdinstall/distfetch/Makefile ============================================================================== --- user/nwhitehorn/bsdinstall/distfetch/Makefile Sat Jan 1 01:05:21 2011 (r216863) +++ user/nwhitehorn/bsdinstall/distfetch/Makefile Sat Jan 1 01:06:27 2011 (r216864) @@ -1,7 +1,7 @@ # $FreeBSD $ PROG= distfetch -LDADD= -lfetch -lncursesw -L/usr/local/lib -lcdialog +LDADD= -lfetch -lncursesw -L/usr/local/lib -lcdialog -lm CFLAGS= -I/usr/local/include WARNS?= 6 Modified: user/nwhitehorn/bsdinstall/distfetch/distfetch.c ============================================================================== --- user/nwhitehorn/bsdinstall/distfetch/distfetch.c Sat Jan 1 01:05:21 2011 (r216863) +++ user/nwhitehorn/bsdinstall/distfetch/distfetch.c Sat Jan 1 01:06:27 2011 (r216864) @@ -116,7 +116,7 @@ fetch_files(int nfiles, char **urls) } if (ustat.size > 0) { - sprintf(status, "-%ld", (fsize*100)/ustat.size); + sprintf(status, "-%jd", (fsize*100)/ustat.size); items[i*2 + 1] = status; } Modified: user/nwhitehorn/bsdinstall/partedit/Makefile ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/Makefile Sat Jan 1 01:05:21 2011 (r216863) +++ user/nwhitehorn/bsdinstall/partedit/Makefile Sat Jan 1 01:06:27 2011 (r216864) @@ -1,7 +1,7 @@ # $FreeBSD $ PROG= partedit -LDADD= -lgeom -lncursesw -lutil -L/usr/local/lib -lcdialog +LDADD= -lgeom -lncursesw -lutil -L/usr/local/lib -lcdialog -lm CFLAGS= -I/usr/local/include PARTEDIT_ARCH= ${MACHINE} Modified: user/nwhitehorn/bsdinstall/partedit/gpart_ops.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Sat Jan 1 01:05:21 2011 (r216863) +++ user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Sat Jan 1 01:06:27 2011 (r216864) @@ -117,7 +117,7 @@ gpart_activate(struct gprovider *pp) intmax_t index; /* - * Some partition scemes need this partition to be marked 'active' + * Some partition schemes need this partition to be marked 'active' * for it to be bootable. */ LIST_FOREACH(gc, &pp->lg_geom->lg_config, lg_config) { @@ -615,7 +615,7 @@ addpartform: gctl_ro_param(r, "flags", -1, GPART_FLAGS); gctl_ro_param(r, "verb", -1, "add"); gctl_ro_param(r, "type", -1, "freebsd-boot"); - snprintf(sizestr, sizeof(sizestr), "%zd", + snprintf(sizestr, sizeof(sizestr), "%jd", partcode_size(scheme) / sector); gctl_ro_param(r, "size", -1, sizestr); snprintf(startstr, sizeof(startstr), "%jd", firstfree); From owner-svn-src-user@FreeBSD.ORG Sat Jan 1 01:26:27 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0243E106566C; Sat, 1 Jan 2011 01:26:27 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CC5918FC08; Sat, 1 Jan 2011 01:26:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p011QQfV094424; Sat, 1 Jan 2011 01:26:26 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p011QQgk094422; Sat, 1 Jan 2011 01:26:26 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201101010126.p011QQgk094422@svn.freebsd.org> From: Doug Barton Date: Sat, 1 Jan 2011 01:26:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216865 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 01:26:27 -0000 Author: dougb Date: Sat Jan 1 01:26:26 2011 New Revision: 216865 URL: http://svn.freebsd.org/changeset/base/216865 Log: Add a test for $PM_INDEX_ONLY to pm_cd_pd itself, rather than testing for it prior to (nearly) every call. This has the side effect of solving the problem of the recently added test for WRKDIRPREFIX when not using any PORTSDIR. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sat Jan 1 01:06:27 2011 (r216864) +++ user/dougb/portmaster/portmaster Sat Jan 1 01:26:26 2011 (r216865) @@ -267,7 +267,8 @@ safe_exit () { } pm_cd () { builtin cd $1 2>/dev/null || return 1; } -pm_cd_pd () { builtin cd $pd/$1 2>/dev/null || +pm_cd_pd () { [ -n "$PM_INDEX_ONLY" ] && return 2; + builtin cd $pd/$1 2>/dev/null || fail "Cannot cd to port directory: $pd/$1"; } pm_kill () { /bin/kill $* >/dev/null 2>/dev/null; } pm_make () { ( unset -v CUR_DEPS INSTALLED_LIST PM_DEPTH build_l; @@ -1554,7 +1555,7 @@ check_for_updates () { echo " ===>>> New version available: $port_ver" [ -e "$pdb/$iport/+IGNOREME" ] && echo " ===>>> +IGNOREME file is present for $1" - [ -z "$PM_INDEX_ONLY" ] && { pm_cd_pd $origin ; check_state; } + pm_cd_pd $origin && check_state num_updates=$(( $num_updates + 1 )) else unset moved_npd @@ -3178,7 +3179,7 @@ fi # [ -n "$PM_FIRST_PASS" ] [ -z "$PM_BUILDING" ] && export PM_BUILDING=pmbuildingmain -[ -z "$PM_INDEX_ONLY" ] && pm_cd_pd $portdir +pm_cd_pd $portdir if [ -n "$PM_BUILD_ONLY_LIST" ]; then case "$build_only_dl_g" in @@ -3200,7 +3201,7 @@ if [ -z "$NO_DEP_UPDATES" ]; then echo "===>>> Starting check for all dependencies" dependency_check all-depends-list fi - [ -z "$PM_INDEX_ONLY" ] && pm_cd_pd $portdir + pm_cd_pd $portdir elif [ "$$" -eq "$PM_PARENT_PID" ]; then echo "===>>> All dependencies are up to date" echo '' @@ -3426,7 +3427,7 @@ if [ -z "$use_package" ]; then fi fi - [ -z "$PM_INDEX_ONLY" ] && pm_cd_pd $portdir + pm_cd_pd $portdir [ -z "$DONT_PRE_CLEAN" ] && { pm_make clean NOCLEANDEPENDS=ncd || fail 'make clean failed'; echo ''; } @@ -3508,13 +3509,13 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" pm_pkg_delete_s -f $upg_port fi - [ -z "$PM_INDEX_ONLY" ] && pm_cd_pd $portdir + pm_cd_pd $portdir fi if [ -z "$RECURSE_THOROUGH" -a -z "$NO_DEP_UPDATES" ]; then echo '' ; echo "===>>> Starting check for runtime dependencies" dependency_check run-depends-list - [ -z "$PM_INDEX_ONLY" ] && pm_cd_pd $portdir + pm_cd_pd $portdir fi install_failed () { From owner-svn-src-user@FreeBSD.ORG Sat Jan 1 01:31:45 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9473F1065672; Sat, 1 Jan 2011 01:31:45 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 84B498FC18; Sat, 1 Jan 2011 01:31:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p011Vj0Z094556; Sat, 1 Jan 2011 01:31:45 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p011VjDr094554; Sat, 1 Jan 2011 01:31:45 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201101010131.p011VjDr094554@svn.freebsd.org> From: Doug Barton Date: Sat, 1 Jan 2011 01:31:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216866 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 01:31:45 -0000 Author: dougb Date: Sat Jan 1 01:31:45 2011 New Revision: 216866 URL: http://svn.freebsd.org/changeset/base/216866 Log: When we enter -PRERELEASE phase the package-finding code should still be looking at -stable. Reported by: Jakub Lach Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sat Jan 1 01:26:26 2011 (r216865) +++ user/dougb/portmaster/portmaster Sat Jan 1 01:31:45 2011 (r216866) @@ -3272,7 +3272,7 @@ fetch_package () { release=`uname -r` case "$release" in - [678]\.[0-9]-STABLE) + [678]\.[0-9]-STABLE|[678]\.[0-9]-PRERELEASE) release=packages-${release%%\.*}-stable ;; [678]\.[0-9]-RELEASE*) release=packages-${release%-RELEASE*}-release ;; From owner-svn-src-user@FreeBSD.ORG Sat Jan 1 06:54:22 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 57AF6106566B; Sat, 1 Jan 2011 06:54:22 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 47A898FC0A; Sat, 1 Jan 2011 06:54:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p016sMLj002078; Sat, 1 Jan 2011 06:54:22 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p016sMCK002076; Sat, 1 Jan 2011 06:54:22 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201101010654.p016sMCK002076@svn.freebsd.org> From: Doug Barton Date: Sat, 1 Jan 2011 06:54:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216867 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 06:54:22 -0000 Author: dougb Date: Sat Jan 1 06:54:21 2011 New Revision: 216867 URL: http://svn.freebsd.org/changeset/base/216867 Log: If PM_PACKAGES is set, don't bother with build depends Reminded by: ale Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sat Jan 1 01:31:45 2011 (r216866) +++ user/dougb/portmaster/portmaster Sat Jan 1 06:54:21 2011 (r216867) @@ -3113,10 +3113,15 @@ if [ -n "$PM_FIRST_PASS" ]; then [ "$$" -eq "$PM_PARENT_PID" -a -n "$PM_BUILD_ONLY_LIST" ] && PM_BUILD_ONLY_LIST=pmp_doing_build_deps - [ -z "$PM_PACKAGES" -a -z "$PM_NO_MAKE_CONFIG" ] && make_config + if [ -z "$PM_PACKAGES" ]; then + [ -z "$PM_NO_MAKE_CONFIG" ] && make_config + + dep_check_type='build-depends-list run-depends-list' + [ -n "$RECURSE_THOROUGH" ] && dep_check_type=all-depends-list + else + dep_check_type=run-depends-list + fi - dep_check_type='build-depends-list run-depends-list' - [ -n "$RECURSE_THOROUGH" ] && dep_check_type=all-depends-list dependency_check "$dep_check_type" [ -n "$UPDATE_REQ_BYS" -o -n "$URB_YES" ] && @@ -3199,7 +3204,12 @@ if [ -z "$NO_DEP_UPDATES" ]; then fi else echo "===>>> Starting check for all dependencies" - dependency_check all-depends-list + + if [ -z "$PM_PACKAGES" ]; then + dependency_check all-depends-list + else + dependency_check run-depends-list + fi fi pm_cd_pd $portdir elif [ "$$" -eq "$PM_PARENT_PID" ]; then From owner-svn-src-user@FreeBSD.ORG Sat Jan 1 07:23:06 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5D4D106566B; Sat, 1 Jan 2011 07:23:06 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 95D6F8FC0C; Sat, 1 Jan 2011 07:23:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p017N63m002695; Sat, 1 Jan 2011 07:23:06 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p017N6Q5002693; Sat, 1 Jan 2011 07:23:06 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201101010723.p017N6Q5002693@svn.freebsd.org> From: Doug Barton Date: Sat, 1 Jan 2011 07:23:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216868 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 07:23:06 -0000 Author: dougb Date: Sat Jan 1 07:23:06 2011 New Revision: 216868 URL: http://svn.freebsd.org/changeset/base/216868 Log: Make handling of DI_FILES consistent Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sat Jan 1 06:54:21 2011 (r216867) +++ user/dougb/portmaster/portmaster Sat Jan 1 07:23:06 2011 (r216868) @@ -1723,7 +1723,7 @@ find_and_delete_distfiles () { distfiles_checked="${distfiles_checked}${file}:" pm_v "===>>> Keeping current distfile: $file" continue ;; # Do not delete current version - *) if [ -e "$DI_FILES" ]; then + *) if [ -s "$DI_FILES" ]; then grep -ql ${ps}$file $DI_FILES && continue fi @@ -3630,7 +3630,7 @@ if [ -n "$distfiles" ]; then echo "DISTFILE:${ds}${file}:SIZE=${size##* }:SHA256=${sha256##* }" \ >> $dist_list_temp # Make sure any new distfiles get added to the list - [ -z "$DONT_SCRUB_DISTFILES" -a ! "$$" -eq "$PM_PARENT_PID" ] && + [ -n "$DI_FILES" -a ! "$$" -eq "$PM_PARENT_PID" ] && echo "${ds}$file" >> $DI_FILES done From owner-svn-src-user@FreeBSD.ORG Sat Jan 1 16:47:13 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 54F341065670; Sat, 1 Jan 2011 16:47:13 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 43C7F8FC16; Sat, 1 Jan 2011 16:47:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p01GlDHl015995; Sat, 1 Jan 2011 16:47:13 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p01GlD9G015992; Sat, 1 Jan 2011 16:47:13 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101011647.p01GlD9G015992@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 1 Jan 2011 16:47:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216872 - user/nwhitehorn/bsdinstall/partedit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 16:47:13 -0000 Author: nwhitehorn Date: Sat Jan 1 16:47:12 2011 New Revision: 216872 URL: http://svn.freebsd.org/changeset/base/216872 Log: Fix two display issues. Autocomputed and existing sizes were truncated to too few digits, which sometimes led to rounding errors when adding new partitions. Also, on systems with 32-bit size_t, the main panel could truncate the medium size, producing nonsense for the displayed sizes of large devices. Modified: user/nwhitehorn/bsdinstall/partedit/diskeditor.h user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Modified: user/nwhitehorn/bsdinstall/partedit/diskeditor.h ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/diskeditor.h Sat Jan 1 15:25:15 2011 (r216871) +++ user/nwhitehorn/bsdinstall/partedit/diskeditor.h Sat Jan 1 16:47:12 2011 (r216872) @@ -1,7 +1,9 @@ +#include + struct partedit_item { int indentation; const char *name; - size_t size; + intmax_t size; const char *type; char *mountpoint; Modified: user/nwhitehorn/bsdinstall/partedit/gpart_ops.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Sat Jan 1 15:25:15 2011 (r216871) +++ user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Sat Jan 1 16:47:12 2011 (r216872) @@ -353,7 +353,7 @@ gpart_edit(struct gprovider *pp) } } - humanize_number(sizestr, 6, pp->lg_mediasize, "B", HN_AUTOSCALE, + humanize_number(sizestr, 7, pp->lg_mediasize, "B", HN_AUTOSCALE, HN_NOSPACE | HN_DECIMAL); items[1].text = sizestr; @@ -566,7 +566,7 @@ gpart_create(struct gprovider *pp) if (size*sector >= 1024*1024) size -= 1024*1024/sector; - humanize_number(sizestr, 6, size*sector, "B", HN_AUTOSCALE, + humanize_number(sizestr, 7, size*sector, "B", HN_AUTOSCALE, HN_NOSPACE | HN_DECIMAL); items[1].text = sizestr; From owner-svn-src-user@FreeBSD.ORG Sat Jan 1 20:33:47 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3A392106566B; Sat, 1 Jan 2011 20:33:47 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2A8A98FC08; Sat, 1 Jan 2011 20:33:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p01KXlwt021057; Sat, 1 Jan 2011 20:33:47 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p01KXls9021055; Sat, 1 Jan 2011 20:33:47 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201101012033.p01KXls9021055@svn.freebsd.org> From: Doug Barton Date: Sat, 1 Jan 2011 20:33:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216877 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Jan 2011 20:33:47 -0000 Author: dougb Date: Sat Jan 1 20:33:46 2011 New Revision: 216877 URL: http://svn.freebsd.org/changeset/base/216877 Log: After checking for WRKDIRPREFIX do 'cd -' so that 'portmaster .' will work Update copyright date Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sat Jan 1 20:17:29 2011 (r216876) +++ user/dougb/portmaster/portmaster Sat Jan 1 20:33:46 2011 (r216877) @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (c) 2005-2010 Douglas Barton, All rights reserved +# Copyright (c) 2005-2011 Douglas Barton, All rights reserved # Please see detailed copyright below trap trap_exit INT @@ -791,7 +791,7 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then fi if [ -n "$pd" ]; then - pm_cd_pd && PM_WRKDIRPREFIX=`pm_make_b -V WRKDIRPREFIX` + pm_cd_pd && PM_WRKDIRPREFIX=`pm_make_b -V WRKDIRPREFIX` && pm_cd - export pd else if [ -n "$EXPUNGE" -o -n "$CLEAN_STALE" ]; then @@ -3736,7 +3736,7 @@ safe_exit #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# Copyright (c) 2005-2010 Douglas Barton +# Copyright (c) 2005-2011 Douglas Barton # All rights reserved. # # Redistribution and use in source and binary forms, with or without