File pkg-paths.patch of Package pkg

Use more appropriate paths.

diff -r 3c3fae42f23d src/setup.py
--- a/src/setup.py	Fri Sep 24 10:34:24 2010 +1200
+++ b/src/setup.py	Sat Oct 02 12:09:26 2010 +0200
@@ -47,6 +47,7 @@
 from distutils.command.clean import clean as _clean
 
 from distutils.sysconfig import get_python_inc
+from distutils.sysconfig import get_python_lib
 import distutils.file_util as file_util
 import distutils.dir_util as dir_util
 import distutils.util as util
@@ -167,7 +168,7 @@
 pkgs_dir = os.path.normpath(os.path.join(pwd, os.pardir, "packages", arch))
 extern_dir = os.path.normpath(os.path.join(pwd, "extern"))
 
-py_install_dir = 'usr/lib/python2.6/vendor-packages'
+py_install_dir = get_python_lib(plat_specific=True)
 
 scripts_dir = 'usr/bin'
 lib_dir = 'usr/lib'
@@ -176,7 +177,7 @@
 man1_dir = 'usr/share/man/cat1'
 man1m_dir = 'usr/share/man/cat1m'
 man5_dir = 'usr/share/man/cat5'
-resource_dir = 'usr/share/lib/pkg'
+resource_dir = 'usr/share/pkg'
 smf_dir = 'var/svc/manifest/application'
 zones_dir = 'etc/zones'
 etcbrand_dir = 'etc/brand/ipkg'
@@ -236,20 +237,18 @@
 
 scripts_other_unix = {
         scripts_dir: [
-                ['client.py', 'client.py'],
-                ['pkgdep.py', 'pkgdep'],
+                ['client.py', 'pkg'],
+                ['pkgdep.py', 'pkgdepend'],
+                ['pkgrepo.py', 'pkgrepo'],
                 ['util/publish/pkgdiff.py', 'pkgdiff'],
                 ['util/publish/pkgfmt.py', 'pkgfmt'],
+                ['util/publish/pkglint.py', 'pkglint'],
                 ['util/publish/pkgmogrify.py', 'pkgmogrify'],
-                ['pull.py', 'pull.py'],
-                ['publish.py', 'publish.py'],
-                ['scripts/pkg.sh', 'pkg'],
-                ['scripts/pkgsend.sh', 'pkgsend'],
-                ['scripts/pkgrecv.sh', 'pkgrecv'],
+                ['publish.py', 'pkgsend'],
+                ['pull.py', 'pkgrecv'],
                 ],
         lib_dir: [
-                ['depot.py', 'depot.py'],
-                ['scripts/pkg.depotd.sh', 'pkg.depotd'],
+                ['depot.py', 'pkg.depotd'],
                 ],
         }
 
@@ -648,6 +647,7 @@
                 print "installing %s" % swname
                 args = ['python2.6', 'setup.py', 'install',
                     '--root=%s' % root_dir,
+                    '--prefix=%s' % sys.prefix,
                     '--install-lib=%s' % py_install_dir,
                     '--install-data=%s' % py_install_dir]
                 run_cmd(args, swdir, env=inst_env)