[PC-BSD Commits] r3331 - in pbibuild/modules/lynx: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-01-26 11:50:22 -0800 (Mon, 26 Jan 2009)
New Revision: 3331

Modified:
   pbibuild/modules/lynx/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/lynx/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/lynx/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/lynx/pbi.conf
Log:

Updated lynx to be 100% self-contained



Modified: pbibuild/modules/lynx/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/lynx/overlay-dir/PBI.FirstRun.sh	2009-01-26 19:47:06 UTC (rev 3330)
+++ pbibuild/modules/lynx/overlay-dir/PBI.FirstRun.sh	2009-01-26 19:50:22 UTC (rev 3331)
@@ -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/lynx" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/lynx | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "Lynx is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/lynx | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep Lynx 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "Lynx could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "Lynx 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 "Lynx is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/lynx/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/lynx/overlay-dir/PBI.RemoveScript.sh	2009-01-26 19:47:06 UTC (rev 3330)
+++ pbibuild/modules/lynx/overlay-dir/PBI.RemoveScript.sh	2009-01-26 19:50:22 UTC (rev 3331)
@@ -6,13 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/lynx
-rm -fR /usr/local/etc/lynx.cfg.default
-rm -fR /usr/local/etc/lynx.lss
-rm -fR /usr/local/man/man1/lynx.1.gz
-rm -fR /usr/local/share/doc/lynx
-rm -fR /usr/local/share/lynx_help
-rm -fR /usr/local/etc/lynx.cfg
 
 if [ ! -z "$DISPLAY" ]
 then

Modified: pbibuild/modules/lynx/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/lynx/overlay-dir/PBI.SetupScript.sh	2009-01-26 19:47:06 UTC (rev 3330)
+++ pbibuild/modules/lynx/overlay-dir/PBI.SetupScript.sh	2009-01-26 19:50:22 UTC (rev 3331)
@@ -14,11 +14,4 @@
 # 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/lynx /usr/local/bin/lynx
-ln -s /Programs/${PROGDIR}/etc/lynx.cfg.default /usr/local/etc/lynx.cfg.default
-ln -s /Programs/${PROGDIR}/etc/lynx.lss /usr/local/etc/lynx.lss
-ln -s /Programs/${PROGDIR}/man/man1/lynx.1.gz /usr/local/man/man1/lynx.1.gz
-ln -s /Programs/${PROGDIR}/share/doc/lynx /usr/local/share/doc/lynx
-ln -s /Programs/${PROGDIR}/share/lynx_help /usr/local/share/lynx_help
-cp /usr/local/etc/lynx.cfg.default /usr/local/etc/lynx.cfg
-
+cp /Programs/${PROGDIR}/etc/lynx.cfg.default /Programs/${PROGDIR}/etc/lynx.cfg

Modified: pbibuild/modules/lynx/pbi.conf
===================================================================
--- pbibuild/modules/lynx/pbi.conf	2009-01-26 19:47:06 UTC (rev 3330)
+++ pbibuild/modules/lynx/pbi.conf	2009-01-26 19:50:22 UTC (rev 3331)
@@ -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="22"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY