[PC-BSD Commits] r3339 - in pbibuild/modules: nessus nessus/overlay-dir netpanzer netpanzer/overlay-dir neverball neverball/overlay-dir nexuiz nexuiz/kmenu-dir nexuiz/overlay-dir nikto nikto/overlay-dir

svn at pcbsd.org svn at pcbsd.org
Tue Jan 27 09:58:31 PST 2009


Author: kris
Date: 2009-01-27 09:58:31 -0800 (Tue, 27 Jan 2009)
New Revision: 3339

Removed:
   pbibuild/modules/nexuiz/kmenu-dir/uninstall
   pbibuild/modules/nexuiz/overlay-dir/scripts/
Modified:
   pbibuild/modules/nessus/build.sh
   pbibuild/modules/nessus/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/nessus/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/nessus/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/nessus/pbi.conf
   pbibuild/modules/netpanzer/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/netpanzer/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/netpanzer/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/netpanzer/pbi.conf
   pbibuild/modules/neverball/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/neverball/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/neverball/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/neverball/pbi.conf
   pbibuild/modules/nexuiz/build.sh
   pbibuild/modules/nexuiz/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/nexuiz/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/nexuiz/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/nexuiz/pbi.conf
   pbibuild/modules/nikto/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/nikto/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/nikto/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/nikto/pbi.conf
Log:

Updated nessus, netpanzer, neverball, nexuiz, and nikto to be 100% self-contained



Modified: pbibuild/modules/nessus/build.sh
===================================================================
--- pbibuild/modules/nessus/build.sh	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/nessus/build.sh	2009-01-27 17:58:31 UTC (rev 3339)
@@ -8,17 +8,3 @@
 # MODULEDIR = The location of the module directory for this PBI
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
-
-# Get all the various language files and copy them to the PBI
-LANGFILE="kmldonkey.mo"
-mkdir ${PBIDIR}/locale/
-cd /usr/local/share/locale
-for i in `ls`
-do
-  if [ -e "/usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}" ]
-  then
-    mkdir ${PBIDIR}/locale/${i}
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE} ${PBIDIR}/locale/${i}/
-  fi
-done
-

Modified: pbibuild/modules/nessus/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/nessus/overlay-dir/PBI.FirstRun.sh	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/nessus/overlay-dir/PBI.FirstRun.sh	2009-01-27 17:58:31 UTC (rev 3339)
@@ -15,34 +15,3 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-
-
-if [ -e "/usr/local/bin/nessus" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/nessus | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "Nessus is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/nessus | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep Nessus 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "Nessus could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "Nessus is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "Nessus is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/nessus/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/nessus/overlay-dir/PBI.RemoveScript.sh	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/nessus/overlay-dir/PBI.RemoveScript.sh	2009-01-27 17:58:31 UTC (rev 3339)
@@ -6,34 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/nasl-config
-rm -fR /usr/local/bin/nessus
-rm -fR /usr/local/bin/nessus-fetch
-rm -fR /usr/local/bin/nessus-mkcert-client
-rm -fR /usr/local/bin/nessus-mkrand
-rm -fR /usr/local/etc/nessus
-rm -fR /usr/local/etc/rc.d/nessusd
-rm -fR /usr/local/include/nessus
-rm -fR /usr/local/lib/libnasl.a
-rm -fR /usr/local/lib/libnasl.la
-rm -fR /usr/local/lib/libnasl.so.4
-rm -fR /usr/local/lib/libnasl.so
-rm -fR /usr/local/man/man1/nasl-config.1.gz
-rm -fR /usr/local/man/man1/nasl.1.gz
-rm -fR /usr/local/man/man1/nessus-fetch.1.gz
-rm -fR /usr/local/man/man1/nessus-mkcert-client.1.gz
-rm -fR /usr/local/man/man1/nessus-mkrand.1.gz
-rm -fR /usr/local/man/man1/nessus.1.gz
-rm -fR /usr/local/man/man8/nessus-adduser.8.gz
-rm -fR /usr/local/man/man8/nessus-mkcert.8.gz
-rm -fR /usr/local/man/man8/nessus-rmuser.8.gz
-rm -fR /usr/local/man/man8/nessusd.8.gz
-rm -fR /usr/local/sbin/nessus-adduser
-rm -fR /usr/local/sbin/nessus-check-signature
-rm -fR /usr/local/sbin/nessus-mkcert
-rm -fR /usr/local/sbin/nessus-rmuser
-rm -fR /usr/local/sbin/nessusd
-rm -fR /usr/local/var/nessus
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/nessus/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/nessus/overlay-dir/PBI.SetupScript.sh	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/nessus/overlay-dir/PBI.SetupScript.sh	2009-01-27 17:58:31 UTC (rev 3339)
@@ -14,34 +14,13 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/.sbin/nasl /usr/local/bin/nasl
-ln -s /Programs/${PROGDIR}/.sbin/nasl-config /usr/local/bin/nasl-config
-ln -s /Programs/${PROGDIR}/.sbin/nessus /usr/local/bin/nessus
-ln -s /Programs/${PROGDIR}/.sbin/nessus-fetch /usr/local/bin/nessus-fetch
-ln -s /Programs/${PROGDIR}/.sbin/nessus-mkcert-client /usr/local/bin/nessus-mkcert-client
-ln -s /Programs/${PROGDIR}/.sbin/nessus-mkrand /usr/local/bin/nessus-mkrand
-ln -s /Programs/${PROGDIR}/etc/nessus /usr/local/etc/nessus
-ln -s /Programs/${PROGDIR}/etc/rc.d/nessusd /usr/local/etc/rc.d/nessusd
-ln -s /Programs/${PROGDIR}/include/nessus /usr/local/include/nessus
-ln -s /Programs/${PROGDIR}/lib/libnasl.a /usr/local/lib/libnasl.a
-ln -s /Programs/${PROGDIR}/lib/libnasl.la /usr/local/lib/libnasl.la
-ln -s /Programs/${PROGDIR}/lib/libnasl.so.4 /usr/local/lib/libnasl.so.4
-ln -s /Programs/${PROGDIR}/lib/libnasl.so /usr/local/lib/libnasl.so
-ln -s /Programs/${PROGDIR}/man/man1/nasl-config.1.gz /usr/local/man/man1/nasl-config.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/nasl.1.gz /usr/local/man/man1/nasl.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/nessus-fetch.1.gz /usr/local/man/man1/nessus-fetch.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/nessus-mkcert-client.1.gz /usr/local/man/man1/nessus-mkcert-client.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/nessus-mkrand.1.gz /usr/local/man/man1/nessus-mkrand.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/nessus.1.gz /usr/local/man/man1/nessus.1.gz
-ln -s /Programs/${PROGDIR}/man/man8/nessus-adduser.8.gz /usr/local/man/man8/nessus-adduser.8.gz
-ln -s /Programs/${PROGDIR}/man/man8/nessus-mkcert.8.gz /usr/local/man/man8/nessus-mkcert.8.gz
-ln -s /Programs/${PROGDIR}/man/man8/nessus-rmuser.8.gz /usr/local/man/man8/nessus-rmuser.8.gz
-ln -s /Programs/${PROGDIR}/man/man8/nessusd.8.gz /usr/local/man/man8/nessusd.8.gz
-ln -s /Programs/${PROGDIR}/sbin/nessus-adduser /usr/local/sbin/nessus-adduser
-ln -s /Programs/${PROGDIR}/sbin/nessus-check-signature /usr/local/sbin/nessus-check-signature
-ln -s /Programs/${PROGDIR}/sbin/nessus-mkcert /usr/local/sbin/nessus-mkcert
-ln -s /Programs/${PROGDIR}/sbin/nessus-rmuser /usr/local/sbin/nessus-rmuser
-ln -s /Programs/${PROGDIR}/sbin/nessusd /usr/local/sbin/nessusd
-ln -s /Programs/${PROGDIR}/var/nessus /usr/local/var/nessus
 
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
+
 echo "LAUNCHCLOSE: /usr/local/bin/nessus"

Modified: pbibuild/modules/nessus/pbi.conf
===================================================================
--- pbibuild/modules/nessus/pbi.conf	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/nessus/pbi.conf	2009-01-27 17:58:31 UTC (rev 3339)
@@ -25,13 +25,13 @@
 PBIUPDATE="http://update.pbidir.com"
 
 # Other Ports we need built (One per line)
-OTHERPORT=""
+OTHERPORT="/usr/ports/x11-themes/qtcurve-gtk2"
 
 # Enter your custom make options here
 MAKEOPTS=""
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="01"
+BUILDKEY="53"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/netpanzer/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/netpanzer/overlay-dir/PBI.FirstRun.sh	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/netpanzer/overlay-dir/PBI.FirstRun.sh	2009-01-27 17:58:31 UTC (rev 3339)
@@ -16,38 +16,6 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-
-if [ -e "/usr/local/bin/netpanzer" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/netpanzer | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "netPanzer is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/netpanzer | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep netPanzer 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "netPanzer could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "netPanzer is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "netPanzer is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 
-#3D APPLICATION: 3D ACC IS NEEDED
-
 glxinfo | grep "direct rendering:" | grep " Yes" 2>/dev/null
 if [ "$?" != "0" ]
 then

Modified: pbibuild/modules/netpanzer/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/netpanzer/overlay-dir/PBI.RemoveScript.sh	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/netpanzer/overlay-dir/PBI.RemoveScript.sh	2009-01-27 17:58:31 UTC (rev 3339)
@@ -6,12 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/netpanzer
-rm -fR /usr/local/share/netpanzer
-rm -fR /usr/local/share/pixmaps/netpanzer.png
-rm -fR /usr/local/share/pixmaps/netpanzer.xpm
-rm -fR /usr/local/share/doc/netpanzer
-#rm -fR /usr/local/share/applications/netpanzer.desktop
 
 if [ ! -z "$DISPLAY" ]
 then

Modified: pbibuild/modules/netpanzer/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/netpanzer/overlay-dir/PBI.SetupScript.sh	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/netpanzer/overlay-dir/PBI.SetupScript.sh	2009-01-27 17:58:31 UTC (rev 3339)
@@ -14,11 +14,13 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/.sbin/netpanzer /usr/local/bin/netpanzer
-ln -s /Programs/${PROGDIR}/share/netpanzer /usr/local/share/netpanzer
-ln -s /Programs/${PROGDIR}/share/pixmaps/netpanzer.png /usr/local/share/pixmaps/netpanzer.png
-ln -s /Programs/${PROGDIR}/share/pixmaps/netpanzer.xpm /usr/local/share/pixmaps/netpanzer.xpm
-ln -s /Programs/${PROGDIR}/share/doc/netpanzer /usr/local/share/doc/netpanzer
-#ln -s /Programs/${PROGDIR}/share/applications/netpanzer.desktop /usr/local/share/applications/netpanzer.desktop
 
-echo "LAUNCHCLOSE: /usr/local/bin/netpanzer"
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
+
+echo "LAUNCHCLOSE: /Programs/bin/netpanzer"

Modified: pbibuild/modules/netpanzer/pbi.conf
===================================================================
--- pbibuild/modules/netpanzer/pbi.conf	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/netpanzer/pbi.conf	2009-01-27 17:58:31 UTC (rev 3339)
@@ -32,6 +32,6 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is stillthe same ver
-BUILDKEY="22"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/neverball/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/neverball/overlay-dir/PBI.FirstRun.sh	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/neverball/overlay-dir/PBI.FirstRun.sh	2009-01-27 17:58:31 UTC (rev 3339)
@@ -16,37 +16,6 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-
-if [ -e "/usr/local/bin/neverball" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/neverball | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "NeverBall is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/neverball | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep NeverBall 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "NeverBall could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "NeverBall is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "NeverBall is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 
-
 #3D APPLICATION: 3D ACC IS NEEDED
 
 glxinfo | grep "direct rendering:" | grep " Yes" 2>/dev/null

Modified: pbibuild/modules/neverball/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/neverball/overlay-dir/PBI.RemoveScript.sh	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/neverball/overlay-dir/PBI.RemoveScript.sh	2009-01-27 17:58:31 UTC (rev 3339)
@@ -6,10 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/neverball
-rm -fR /usr/local/bin/neverputt
-rm -fR /usr/local/share/neverball
-rm -fR /usr/local/share/doc/neverball
 
 if [ ! -z "$DISPLAY" ]
 then

Modified: pbibuild/modules/neverball/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/neverball/overlay-dir/PBI.SetupScript.sh	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/neverball/overlay-dir/PBI.SetupScript.sh	2009-01-27 17:58:31 UTC (rev 3339)
@@ -14,9 +14,13 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/.sbin/neverball /usr/local/bin/neverball
-ln -s /Programs/${PROGDIR}/.sbin/neverputt /usr/local/bin/neverputt
-ln -s /Programs/${PROGDIR}/share/neverball /usr/local/share/neverball
-ln -s /Programs/${PROGDIR}/share/doc/neverball /usr/local/share/doc/neverball
 
-echo "LAUNCHCLOSE: /usr/local/bin/neverball"
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
+
+echo "LAUNCHCLOSE: /Programs/bin/neverball"

Modified: pbibuild/modules/neverball/pbi.conf
===================================================================
--- pbibuild/modules/neverball/pbi.conf	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/neverball/pbi.conf	2009-01-27 17:58:31 UTC (rev 3339)
@@ -32,6 +32,6 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="02"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/nexuiz/build.sh
===================================================================
--- pbibuild/modules/nexuiz/build.sh	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/nexuiz/build.sh	2009-01-27 17:58:31 UTC (rev 3339)
@@ -9,7 +9,3 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,Nexuiz${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh

Modified: pbibuild/modules/nexuiz/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/nexuiz/overlay-dir/PBI.FirstRun.sh	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/nexuiz/overlay-dir/PBI.FirstRun.sh	2009-01-27 17:58:31 UTC (rev 3339)
@@ -16,38 +16,6 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-
-if [ -e "/usr/local/bin/nexuiz-dedicated" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/nexuiz | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "Nexuiz is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/nexuiz | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep Nexuiz 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "Nexuiz could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "Nexuiz is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "Nexuiz is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi
-
- 
 #3D APPLICATION: 3D ACC IS NEEDED
 
 glxinfo | grep "direct rendering:" | grep " Yes" 2>/dev/null

Modified: pbibuild/modules/nexuiz/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/nexuiz/overlay-dir/PBI.RemoveScript.sh	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/nexuiz/overlay-dir/PBI.RemoveScript.sh	2009-01-27 17:58:31 UTC (rev 3339)
@@ -6,10 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/share/nexuiz
-rm -fR /usr/local/bin/nexuiz-dedicated
-rm -fR /usr/local/bin/nexuiz-glx
-rm -fR /usr/local/bin/nexuiz-sdl
 
 if [ ! -z "$DISPLAY" ]
 then

Modified: pbibuild/modules/nexuiz/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/nexuiz/overlay-dir/PBI.SetupScript.sh	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/nexuiz/overlay-dir/PBI.SetupScript.sh	2009-01-27 17:58:31 UTC (rev 3339)
@@ -14,7 +14,11 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/share/nexuiz /usr/local/share/nexuiz
-ln -s /Programs/${PROGDIR}/.sbin/nexuiz-dedicated /usr/local/bin/nexuiz-dedicated
-ln -s /Programs/${PROGDIR}/.sbin/nexuiz-glx /usr/local/bin/nexuiz-glx
-ln -s /Programs/${PROGDIR}/.sbin/nexuiz-sdl /usr/local/bin/nexuiz-sdl
\ No newline at end of file
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
+

Modified: pbibuild/modules/nexuiz/pbi.conf
===================================================================
--- pbibuild/modules/nexuiz/pbi.conf	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/nexuiz/pbi.conf	2009-01-27 17:58:31 UTC (rev 3339)
@@ -32,6 +32,6 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="33"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/nikto/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/nikto/overlay-dir/PBI.FirstRun.sh	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/nikto/overlay-dir/PBI.FirstRun.sh	2009-01-27 17:58:31 UTC (rev 3339)
@@ -16,33 +16,3 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-
-if [ -e "/usr/local/bin/nikto" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/nikto | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "Nikto is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/nikto | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep Nikto 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "Nikto could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "Nikto is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "Nikto is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/nikto/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/nikto/overlay-dir/PBI.RemoveScript.sh	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/nikto/overlay-dir/PBI.RemoveScript.sh	2009-01-27 17:58:31 UTC (rev 3339)
@@ -6,8 +6,3 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/nikto
-rm -fR /usr/local/etc/nikto.conf.sample
-rm -fR /usr/local/share/doc/nikto
-rm -fR /usr/local/share/nikto
-rm -fR /usr/local/etc/nikto.conf

Modified: pbibuild/modules/nikto/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/nikto/overlay-dir/PBI.SetupScript.sh	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/nikto/overlay-dir/PBI.SetupScript.sh	2009-01-27 17:58:31 UTC (rev 3339)
@@ -14,9 +14,12 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/.sbin/nikto /usr/local/bin/nikto
-ln -s /Programs/${PROGDIR}/etc/nikto.conf.sample /usr/local/etc/nikto.conf.sample
-cp -fR /Programs/${PROGDIR}/etc/nikto.conf.sample /Programs/${PROGDIR}/etc/nikto.conf
-ln -s /Programs/${PROGDIR}/share/doc/nikto /usr/local/share/doc/nikto
-ln -s /Programs/${PROGDIR}/share/nikto /usr/local/share/nikto
-ln -s /Programs/${PROGDIR}/etc/nikto.conf /usr/local/etc/nikto.conf
+
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
+

Modified: pbibuild/modules/nikto/pbi.conf
===================================================================
--- pbibuild/modules/nikto/pbi.conf	2009-01-27 03:14:01 UTC (rev 3338)
+++ pbibuild/modules/nikto/pbi.conf	2009-01-27 17:58:31 UTC (rev 3339)
@@ -32,6 +32,6 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="03"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list