3 files changed, 43 insertions, 1 deletions

diff --git a/net-mgmt/noc/files/patch-main_management_commands_sync-doc.py b/net-mgmt/noc/files/patch-main_management_commands_sync-doc.py
new file mode 100644
index 000000000000..210c99edea29
--- /dev/null
+++ b/net-mgmt/noc/files/patch-main_management_commands_sync-doc.py
@@ -0,0 +1,29 @@
+--- main/management/commands/sync-doc.py.orig	2011-01-31 16:14:43.000000000 +0600
++++ main/management/commands/sync-doc.py	2011-01-31 16:17:57.000000000 +0600
+@@ -43,10 +43,6 @@ class Command(BaseCommand):
+         return rewrite_when_differ(db_path,out.getvalue())
+         
+     def handle(self, *args, **options):
+-        # Prepare paths
+-        sphinx_build=os.path.abspath(os.path.join("contrib","bin","sphinx-build"))
+-        if not os.path.exists(sphinx_build):
+-            raise CommandError("%s not found. Please rebuild contrib/"%sphinx_build)
+         #
+         se_db_updated=self.update_se_db()
+         # Prepare options
+@@ -56,6 +52,8 @@ class Command(BaseCommand):
+         # Prepare environment
+         env=os.environ.copy()
+         env["PYTHONPATH"]=":".join(sys.path)
++	# add path from contrib
++	env["PATH"]=os.path.abspath(os.path.join("contrib","bin"))+":"+env["PATH"]
+         # Rebuild all documentation
+         for conf in glob.glob("share/docs/*/*/conf.py"):
+             d,f=os.path.split(conf)
+@@ -69,5 +67,5 @@ class Command(BaseCommand):
+                         os.makedirs(p)
+                     except OSError:
+                         raise CommandError("Unable to create directory: %s"%p)
+-            cmd=[sphinx_build]+opts+["-b","html","-d",doctrees,"-D","latex_paper_size=a4",".",html]
++            cmd=["sphinx-build"]+opts+["-b","html","-d",doctrees,"-D","latex_paper_size=a4",".",html]
+             subprocess.call(cmd,cwd=d,env=env)
diff --git a/net-mgmt/noc/files/patch-scripts_sync-contrib b/net-mgmt/noc/files/patch-scripts_sync-contrib
new file mode 100644
index 000000000000..c34ec9edacfc
--- /dev/null
+++ b/net-mgmt/noc/files/patch-scripts_sync-contrib
@@ -0,0 +1,13 @@
+--- scripts/sync-contrib.orig	2011-01-31 16:18:59.000000000 +0600
++++ scripts/sync-contrib	2011-01-31 16:23:13.000000000 +0600
+@@ -107,6 +107,10 @@ class Installer(object):
+         return self.install("protobuf")
+ 
+ if __name__=="__main__":
++    # Always return 0 on FreeBSD
++    if os.uname()[0] == 'FreeBSD':
++	sys.exit(0);
++
+     check_only=False
+     optlist,optargs=getopt.getopt(sys.argv[1:],"c")
+     for k,v in optlist:
diff --git a/net-mgmt/noc/files/pkg-deinstall.in b/net-mgmt/noc/files/pkg-deinstall.in
index 7ac2e12ad018..5e92b6fff945 100644
--- a/net-mgmt/noc/files/pkg-deinstall.in
+++ b/net-mgmt/noc/files/pkg-deinstall.in
@@ -20,7 +20,7 @@ if [ "$2" = "POST-DEINSTALL" ]; then
     ##
     ## Remove created directories
     ##
-    for d in ${NOCDIR}/local ${NOCDIR}/static/doc ${NOCDIR} ${NOCDBDIR}/repo ${NOCDBDIR}/backup ${NOCDBDIR} /var/log/noc; do
+    for d in ${NOCDIR}/local ${NOCDIR}/static ${NOCDIR}/static/* ${NOCDIR} ${NOCDBDIR}/repo ${NOCDBDIR}/backup ${NOCDBDIR} /var/log/noc ${LOCALSTATE_DIR}; do
 	if [ -e $d ]; then
 	    echo "You should manually remove the \"${d}\" directory."
 	fi