. forget obsolete /usr/local/bin in $PATH

. update release.sh's notion of where packages are
  . update release.sh's notion of how many files are on root
    as -xdev won't work anymore to separate /usr from /

commands/man/man.conf

@@ -3,4 +3,4 @@ _subdir         man[1-9]
 _suffix         .0
 _build          .[1-9]  mandoc %s
 _build          .tbl    tbl %s | mandoc 
-_default        /usr/man /usr/pkg/X11R6/man /usr/pkg/man /usr/pkg/gcc44/man /usr/llvm/share/man
+_default        /usr/man /usr/pkg/X11R6/man /usr/pkg/man /usr/pkg/gcc44/man

etc/ast/.ashrc

@@ -7,7 +7,7 @@ umask 022
 # Favourite editor and pager, search path for binaries, etc.
 export EDITOR=vi
 export PAGER=more
-export PATH=$HOME/bin:/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/pkg/bin:/usr/pkg/sbin:/usr/llvm/bin
+export PATH=$HOME/bin:/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/pkg/bin:/usr/pkg/sbin:/usr/pkg/X11R6/bin
 
 } # End of no-repeat.
 

etc/pkgsrc.conf

@@ -46,4 +46,7 @@ RCD_SCRIPTS_DIR=/usr/pkg/etc/rc.d
 # no g- prefix for binutils
 BINUTILS_PROGRAM_PREFIX=
 
+# where to keep binary packages
+PACKAGES=${PKGSRCDIR}/packages/${OS_VERSION}/${MACHINE_ARCH}
+
 .endif            # end pkgsrc settings

etc/rc

@@ -6,7 +6,7 @@ exec </dev/null
 
 umask 022
 TERM="${TERM-minix}"
-PATH=/usr/local/bin:/bin:/usr/bin:/usr/sbin:/usr/pkg/bin:/usr/pkg/sbin:/usr/llvm/bin:/sbin
+PATH=/usr/local/bin:/bin:/usr/bin:/usr/sbin:/usr/pkg/bin:/usr/pkg/sbin:/sbin
 RC_TZ=/etc/rc.timezone
 export TERM PATH
 

lib/clang_build.sh

@@ -3,6 +3,6 @@
 export CC=clang
 export COMPILER_TYPE=gnu
 export MAKEOBJDIR=obj-gnu
-export PATH=$PATH:/usr/pkg/bin:/usr/gnu/bin:/usr/llvm/bin
+export PATH=$PATH:/usr/pkg/bin
 
 make $@

lib/gnu_build.sh

@@ -2,6 +2,6 @@
 
 export CC=gcc
 export MAKEOBJDIR=obj-gnu
-export PATH=$PATH:/usr/pkg/bin:/usr/gnu/bin
+export PATH=$PATH:/usr/pkg/bin
 
 make $@

man/man8/Makefile

@@ -4,7 +4,7 @@ MAN=	add_route.8 adduser.8 backup.8 badblocks.8 boot.8 \
 	getty.8 halt.8 hgfs.8 httpd.8 ifconfig.8 inet.8 init.8 \
 	installboot.8 intr.8 irdpd.8 loadramdisk.8 MAKEDEV.8 \
 	mkdist.8 mknod.8 monitor.8 netconf.8 newroot.8 nonamed.8 \
-	ossdevlinks.8 packit.8 packman.8 part.8 partition.8 \
+	ossdevlinks.8 part.8 partition.8 \
 	poweroff.8 printroot.8 pr_routes.8 pwdauth.8 rarpd.8 \
 	rdate.8 readclock.8 reboot.8 repartition.8 rlogind.8 \
 	rshd.8 savemixer.8 screendump.8 serial-ip.8 service.8 \

man/man8/packit.8

@@ -1,29 +0,0 @@
-.TH PACKIT 8
-.SH NAME
-packit \- install binary packman package
-.SH SYNOPSIS
-\fBpackit
-.RB <package file> 
-\fR
-.br
-.de FL
-.TP
-\\fB\\$1\\fR
-\\$2
-..
-.de EX
-.TP 20
-\\fB\\$1\\fR
-# \\$2
-..
-.SH DESCRIPTION
-.PP
-.I packit
-is used to install binary packman packages. In case a 
-.B .postinstall
-file is present in the package, it will be executed using sh -e. Finally,
-.I packit 
-installs (newly added) man pages located in the directories /usr/man,
-/usr/local/man, /usr/gnu/man, and /usr/X11R6/man.
-.SH "SEE ALSO"
-.BR packman (8).

man/man8/packman.8

@@ -1,33 +0,0 @@
-.TH PACKMAN 8
-.SH NAME
-packman \- install binary and source packages
-.SH SYNOPSIS
-\fBpackman\fR
-.br
-.de FL
-.TP
-\\fB\\$1\\fR
-\\$2
-..
-.de EX
-.TP 20
-\\fB\\$1\\fR
-# \\$2
-..
-.SH DESCRIPTION
-.PP
-\s-1MINIX 3\s-1
-uses
-.I packman
-to install binary and source packages from CD or repository. 
-.I packman
-checks if a CD with packages (i.e. 
-\s-1MINIX 3\s-1
-install disk) and a working network connection is present, and interactively 
-ask you which of the available sources to use. In case you have a working 
-networking connection,
-.I packman
-inquires to retrieve the latest package list. Subsequently, a list of available
-packages is shown and you are asked which packages to install.
-.SH "SEE ALSO"
-.BR packit (8).

servers/ext2/link.c

@@ -74,10 +74,13 @@ PUBLIC int fs_link()
   }
 
   /* Temporarily open the last dir */
-  if( (ip = get_inode(fs_dev, fs_m_in.REQ_DIR_INO)) == NULL)
-	  return(EINVAL);
+  if( (ip = get_inode(fs_dev, fs_m_in.REQ_DIR_INO)) == NULL) {
+  	put_inode(rip);
+	return(EINVAL);
+  }
 
   if (ip->i_links_count == NO_LINK) {	/* Dir does not actually exist */
+  	put_inode(rip);
 	put_inode(ip);
 	return(ENOENT);
   }
@@ -347,6 +350,7 @@ PUBLIC int fs_rename()
 
   if (r == EENTERMOUNT || r == ELEAVEMOUNT) {
 	put_inode(old_ip);
+	old_ip = NULL;
 	if (r == EENTERMOUNT) r = EXDEV;	/* should this fail at all? */
 	else if (r == ELEAVEMOUNT) r = EINVAL;	/* rename on dot-dot */
   }
@@ -354,12 +358,13 @@ PUBLIC int fs_rename()
   /* Get new dir inode */
   if( (new_dirp = get_inode(fs_dev, (ino_t) fs_m_in.REQ_REN_NEW_DIR)) == NULL)
 	r = err_code;
-
-  if (new_dirp->i_links_count == NO_LINK) { /* Dir does not actually exist */
-  	put_inode(old_ip);
-  	put_inode(old_dirp);
-  	put_inode(new_dirp);
-  	return(ENOENT);
+  else {
+	if (new_dirp->i_links_count == NO_LINK) { /* Dir does not actually exist */
+		put_inode(old_ip);
+		put_inode(old_dirp);
+		put_inode(new_dirp);
+		return(ENOENT);
+	}
   }
 
   new_ip = advance(new_dirp, new_name, IGN_PERM); /* not required to exist */
@@ -368,6 +373,7 @@ PUBLIC int fs_rename()
    * Note that ELEAVEMOUNT is covered by the dot-dot check later. */
   if(err_code == EENTERMOUNT) {
 	put_inode(new_ip);
+	new_ip = NULL;
 	r = EBUSY;
   }
 

servers/mfs/link.c

@@ -68,10 +68,13 @@ PUBLIC int fs_link()
   }
 
   /* Temporarily open the last dir */
-  if( (ip = get_inode(fs_dev, (ino_t) fs_m_in.REQ_DIR_INO)) == NULL)
-	  return(EINVAL);
+  if( (ip = get_inode(fs_dev, (ino_t) fs_m_in.REQ_DIR_INO)) == NULL) {
+	put_inode(rip);
+	return(EINVAL);
+  }
 
   if (ip->i_nlinks == NO_LINK) {	/* Dir does not actually exist */
+  	put_inode(rip);
 	put_inode(ip);
   	return(ENOENT);
   }
@@ -315,6 +318,7 @@ PUBLIC int fs_rename()
 
   if (r == EENTERMOUNT || r == ELEAVEMOUNT) {
 	put_inode(old_ip);
+	old_ip = NULL;
 	if (r == EENTERMOUNT) r = EXDEV;	/* should this fail at all? */
 	else if (r == ELEAVEMOUNT) r = EINVAL;	/* rename on dot-dot */
   }
@@ -322,12 +326,13 @@ PUBLIC int fs_rename()
   /* Get new dir inode */ 
   if( (new_dirp = get_inode(fs_dev, (ino_t) fs_m_in.REQ_REN_NEW_DIR)) == NULL) 
 	r = err_code;
-
-  if (new_dirp->i_nlinks == NO_LINK) {	/* Dir does not actually exist */
-  	put_inode(old_ip);
-  	put_inode(old_dirp);
-  	put_inode(new_dirp);
-  	return(ENOENT);
+  else {
+	if (new_dirp->i_nlinks == NO_LINK) {	/* Dir does not actually exist */
+  		put_inode(old_ip);
+  		put_inode(old_dirp);
+  		put_inode(new_dirp);
+  		return(ENOENT);
+	}
   }
   
   new_ip = advance(new_dirp, new_name, IGN_PERM); /* not required to exist */
@@ -336,6 +341,7 @@ PUBLIC int fs_rename()
    * Note that ELEAVEMOUNT is covered by the dot-dot check later. */
   if(err_code == EENTERMOUNT) {
 	put_inode(new_ip);
+	new_ip = NULL;
 	r = EBUSY;
   }
 

tools/packages.install

@@ -77,3 +77,4 @@ vim-share-7.2.442
 x11-6.8.2
 x11-links-0.50
 zip-3.0nb2
+minix-all-1nb1

tools/release.sh

@@ -2,12 +2,10 @@
 
 set -e
 
-PATH=$PATH:/usr/local/bin
-
 XBIN=usr/xbin
 SRC=src
 
-PACKAGEDIR=/usr/pkgsrc/packages
+PACKAGEDIR=/usr/pkgsrc/packages/`uname -r`/`uname -m`
 # List of packages included on installation media
 PACKAGELIST=packages.install
 secs=`expr 32 '*' 64`
@@ -429,7 +427,7 @@ fi
 echo " * Counting files"
 extrakb=`du -s $RELEASEDIR/usr/install | awk '{ print $1 }'`
 find $RELEASEDIR/usr | fgrep -v /install/ | wc -l >$RELEASEDIR/.usrfiles
-find $RELEASEDIR -xdev | wc -l >$RELEASEDIR/.rootfiles
+find $RELEASEDIR -print -path $RELEASEDIR/usr -prune | wc -l >$RELEASEDIR/.rootfiles
 
 echo " * Writing fstab"
 if [ "$USB" -ne 0 ]