merge local changes

sys/games/lib/fortunes

@@ -4651,4 +4651,7 @@ I can no longer sit back and allow NIX infiltration, NIX indoctrination, NIX sub
 kfx bases a system of government on forced sodomy
 (#cat-v) <aiju> what good is a cure for AIDS if we can't  get epistemology right?
 please, grow up! -- Skip Travakkolian
-(#cat-v) <nelnire> Not funny.
+(#cat-v) <kfx> why the fuck do germans insist on communicating in their dumb little code
+<aiju> we need objectivism oriented programming!
+<cinap_lenrek> ports are the economic engine for the elite <cinap_lenrek> occupy port 80!
+CTC is a Java application that is installed in two locations.

sys/man/1/pkg

@@ -43,7 +43,12 @@ repository. The source directory should be provided as a full path.
 .I Pkg/install 
 Install the package
 .I name
-from the current repository.
+from the current repository, unpacking the executables in
+.B /$cputype/bin/
+or
+.B /rc/bin/
+and the source in
+.B /sys/src/pkg/.
 .TP
 .I Pkg/list
 List packages available from the current repository.
@@ -73,10 +78,13 @@ programming language:
 % pkg/install go-2011.05.10
 .EE
 .SH FILES
-.TF /sys/lib/pkg/*
+.TF
 .TP
 .B /sys/lib/pkg/*
 hash files of packages installed locally.
+.TP
+.B /sys/src/pkg/*
+source files of packages installed locally.
 .SH SOURCE
 .B /sys/src/cmd/pkg/create
 .br
@@ -89,5 +97,9 @@ hash files of packages installed locally.
 .B /sys/src/cmd/pkg/remove
 .br
 .B /sys/src/cmd/pkg/unpkg.c
+.SH REPOSITORIES
+.B http://pkg.violetti.org/386
+.br
+.B http://plan9.stanleylieber.com/pkg/386
 .SH SEE ALSO
 .IR contrib (1)

sys/src/cmd/pkg/create

@@ -5,14 +5,14 @@ d=$1
 echo Creating $i
 C=`{pwd}
 @{
-rfork en
-mkdir -p /tmp/$i/files/sys/src/cmd/$i
-dircp $d /tmp/$i/files/sys/src/cmd/$i
-cd $d
-mk
-divergefs -p /tmp/$i /
-mk install clean
-unmount /
+	rfork en
+	mkdir -p /tmp/$i/files/sys/src/pkg/$i
+	dircp $d /tmp/$i/files/sys/src/pkg/$i
+	cd $d
+	mk
+	divergefs -p /tmp/$i /
+	mk install clean
+	unmount /
 }
 cd /tmp/$i/files
 rm -r env

sys/src/cmd/pkg/install

@@ -1,7 +1,7 @@
 #!/bin/rc
 
 if(~ $#pkgpath 0)
-	pkgpath=http://pkg.violetti.org/$cputype
+	pkgpath=http://plan9.stanleylieber.com/pkg/$cputype
 
 cd /
 mkdir -p /sys/lib/pkg

sys/src/cmd/pkg/list

@@ -1,7 +1,7 @@
 #!/bin/rc
 
 if(~ $#pkgpath 0)
-	pkgpath=http://pkg.violetti.org/$cputype
+	pkgpath=http://plan9.stanleylieber.com/pkg/$cputype
 
 if(~ $pkgpath ftp* http*)
 	hget $pkgpath | htmlfmt | grep '\.tbz' | sed -e 's/\.tbz$//'

sys/src/cmd/pkg/remove

@@ -14,5 +14,6 @@ if(test -s /sys/lib/pkg/$1) {
 			echo M $fs($i) NOT DELETING
 		}
 	}
+	rm -rf /sys/src/pkg/$1
 	rm /sys/lib/pkg/$1
 }