[PC-BSD Commits] r3343 - in pbibuild/modules: rapidsvn rapidsvn/overlay-dir recordmydesktop recordmydesktop/overlay-dir rtcw rtcw/overlay-dir

svn at pcbsd.org svn at pcbsd.org
Tue Jan 27 11:07:07 PST 2009


Author: kris
Date: 2009-01-27 11:07:07 -0800 (Tue, 27 Jan 2009)
New Revision: 3343

Modified:
   pbibuild/modules/rapidsvn/build.sh
   pbibuild/modules/rapidsvn/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/rapidsvn/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/rapidsvn/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/rapidsvn/pbi.conf
   pbibuild/modules/recordmydesktop/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/recordmydesktop/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/recordmydesktop/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/recordmydesktop/pbi.conf
   pbibuild/modules/rtcw/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/rtcw/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/rtcw/pbi.conf
Log:

Updated rapidsvn, recordmydesktop and rtcw to be 100% self-contained




Modified: pbibuild/modules/rapidsvn/build.sh
===================================================================
--- pbibuild/modules/rapidsvn/build.sh	2009-01-27 18:46:04 UTC (rev 3342)
+++ pbibuild/modules/rapidsvn/build.sh	2009-01-27 19:07:07 UTC (rev 3343)
@@ -9,9 +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,CHANGE,RapidSVN${PORTVER},g" ${PBIDIR}/bin/rapidsvn.sh > /tmp/rapidsvn.sh
-mv /tmp/rapidsvn.sh ${PBIDIR}/bin/rapidsvn.sh
-chmod 755 ${PBIDIR}/bin/rapidsvn.sh
-
-

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

Modified: pbibuild/modules/rapidsvn/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/rapidsvn/overlay-dir/PBI.RemoveScript.sh	2009-01-27 18:46:04 UTC (rev 3342)
+++ pbibuild/modules/rapidsvn/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
@@ -6,11 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/rapidsvn
-rm -fR /usr/local/lib/libsvncpp.a
-rm -fR /usr/local/lib/libsvncpp.la
-rm -fR /usr/local/lib/libsvncpp.so
-rm -fR /usr/local/lib/libsvncpp.so.0
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/rapidsvn/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/rapidsvn/overlay-dir/PBI.SetupScript.sh	2009-01-27 18:46:04 UTC (rev 3342)
+++ pbibuild/modules/rapidsvn/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
@@ -14,10 +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/rapidsvn.sh /usr/local/bin/rapidsvn
-ln -s /Programs/${PROGDIR}/lib/libsvncpp.a /usr/local/lib/libsvncpp.a
-ln -s /Programs/${PROGDIR}/lib/libsvncpp.la /usr/local/lib/libsvncpp.la
-ln -s /Programs/${PROGDIR}/lib/libsvncpp.so /usr/local/lib/libsvncpp.so
-ln -s /Programs/${PROGDIR}/lib/libsvncpp.so.0 /usr/local/lib/libsvncpp.so.0
 
-echo "LAUNCHCLOSE: /usr/local/bin/rapidsvn"
+# 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/rapidsvn"

Modified: pbibuild/modules/rapidsvn/pbi.conf
===================================================================
--- pbibuild/modules/rapidsvn/pbi.conf	2009-01-27 18:46:04 UTC (rev 3342)
+++ pbibuild/modules/rapidsvn/pbi.conf	2009-01-27 19:07:07 UTC (rev 3343)
@@ -32,7 +32,7 @@
 
 # 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="21"
+BUILDKEY="01"
 
 # Mark this port as broken until it gets fixed in ports
 PORTBROKE="NO" ; export PORTBROKE

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

Modified: pbibuild/modules/recordmydesktop/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/recordmydesktop/overlay-dir/PBI.RemoveScript.sh	2009-01-27 18:46:04 UTC (rev 3342)
+++ pbibuild/modules/recordmydesktop/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
@@ -6,5 +6,3 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/recordmydesktop
-rm -fR /usr/local/man/man1/recordmydesktop.1.gz
\ No newline at end of file

Modified: pbibuild/modules/recordmydesktop/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/recordmydesktop/overlay-dir/PBI.SetupScript.sh	2009-01-27 18:46:04 UTC (rev 3342)
+++ pbibuild/modules/recordmydesktop/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
@@ -14,8 +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}/bin/recordmydesktop /usr/local/bin/recordmydesktop
-ln -s /Programs/${PROGDIR}/man/man1/recordmydesktop.1.gz /usr/local/man/man1/recordmydesktop.1.gz
-chmod 775 /Programs/${PROGDIR}/bin/manpage.sh
-chmod +x /Programs/${PROGDIR}/bin/manpage.sh
-chmod 775 /Programs/${PROGDIR}/manpage.html
+
+# 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/recordmydesktop/pbi.conf
===================================================================
--- pbibuild/modules/recordmydesktop/pbi.conf	2009-01-27 18:46:04 UTC (rev 3342)
+++ pbibuild/modules/recordmydesktop/pbi.conf	2009-01-27 19:07:07 UTC (rev 3343)
@@ -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="05"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/rtcw/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/rtcw/overlay-dir/PBI.RemoveScript.sh	2009-01-27 18:46:04 UTC (rev 3342)
+++ pbibuild/modules/rtcw/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
@@ -6,8 +6,3 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -r /usr/local/share/rtcw
-rm -r /usr/local/share/doc/rtcw
-rm /usr/local/bin/wolfsp
-rm /usr/local/bin/wolfded
-rm /usr/local/bin/wolf

Modified: pbibuild/modules/rtcw/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/rtcw/overlay-dir/PBI.SetupScript.sh	2009-01-27 18:46:04 UTC (rev 3342)
+++ pbibuild/modules/rtcw/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
@@ -14,16 +14,11 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-chmod 755 ${PROG_PATH}/bin/wolf*
 
-ln -s /Programs/${PROGDIR}/.sbin/wolfsp /usr/local/bin/wolfsp
-ln -s /Programs/${PROGDIR}/.sbin/wolfded /usr/local/bin/wolfded
-ln -s /Programs/${PROGDIR}/.sbin/wolf /usr/local/bin/wolf
-
-if [ -f /usr/local/share/rtcw ]
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
 then
-	rm -r /usr/local/share/rtcw
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
 fi
-
-ln -s /Programs/${PROGDIR}/share/rtcw /usr/local/share/rtcw
-ln -s /Programs/${PROGDIR}/share/doc/rtcw /usr/local/share/doc/rtcw

Modified: pbibuild/modules/rtcw/pbi.conf
===================================================================
--- pbibuild/modules/rtcw/pbi.conf	2009-01-27 18:46:04 UTC (rev 3342)
+++ pbibuild/modules/rtcw/pbi.conf	2009-01-27 19:07:07 UTC (rev 3343)
@@ -35,6 +35,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



More information about the Commits mailing list