ref: c7f7f935eb1cc80f50f58567ee1b3f827afb1966
parent: ce424fecf0e3b286ac970bbab049026e35ace6be
parent: 3accbf015db0a0f2628bd69c0f8ac9c3448b9d25
author: cinap_lenrek <cinap_lenrek@centraldogma>
date: Fri Jan 6 13:49:05 EST 2012
merge local changes
--- a/lib/troll
+++ b/lib/troll
@@ -57,3 +57,5 @@
Petition to have Obama address occupy wallstreet movement
When Remington first started marketing typewriters, the company assumed the machine would not be used for composing but for transcribing dictation, and that the person typing would be a woman. Flowers were printed on the casing of early models to make the machine seem more comfortable for women to use.
Bigelow & Holmes, Inc. created the screen fonts in the luc, lucm, lucsans, and pelm directories and granted permission to redistribute them with plan9port.
+I tested DNS Bench from grc.com against Plan 9 running in VirtualBox and fossil died.
+venti can store data, but not delete it, fossil can delete data, but not store it, they complement each other perfectly!
--- a/sys/games/lib/fortunes
+++ b/sys/games/lib/fortunes
@@ -4651,4 +4651,7 @@
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.
--- a/sys/man/1/pkg
+++ b/sys/man/1/pkg
@@ -43,7 +43,12 @@
.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 @@
% 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 @@
.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)
--- a/sys/src/cmd/pkg/create
+++ b/sys/src/cmd/pkg/create
@@ -5,14 +5,14 @@
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
--- a/sys/src/cmd/pkg/install
+++ b/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
--- a/sys/src/cmd/pkg/list
+++ b/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$//'
--- a/sys/src/cmd/pkg/remove
+++ b/sys/src/cmd/pkg/remove
@@ -14,5 +14,6 @@
echo M $fs($i) NOT DELETING
}
}
+ rm -rf /sys/src/pkg/$1
rm /sys/lib/pkg/$1
}
--
⑨