[PC-BSD Commits] r3403 - in pbibuild/modules/kvirc: . overlay-dir

svn at pcbsd.org svn at pcbsd.org
Mon Feb 2 14:27:25 PST 2009


Author: kris
Date: 2009-02-02 14:27:25 -0800 (Mon, 02 Feb 2009)
New Revision: 3403

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

Updated kvirc, now 100% self-contained



Modified: pbibuild/modules/kvirc/copy-files
===================================================================
--- pbibuild/modules/kvirc/copy-files	2009-02-02 22:09:48 UTC (rev 3402)
+++ pbibuild/modules/kvirc/copy-files	2009-02-02 22:27:25 UTC (rev 3403)
@@ -8,15 +8,19 @@
 /usr/local/lib/libkvilib.so lib/
 /usr/local/lib/libkvilib.so.3 lib/
 /usr/local/share/applnk/Internet/kvirc.desktop share/applnk/Internet/
-/usr/local/share/icons/hicolor/16x16/apps/kvirc.png share/icons/hicolor/16x16/apps/
-/usr/local/share/icons/hicolor/16x16/mimetypes/kvs.png share/icons/hicolor/16x16/mimetypes/
-/usr/local/share/icons/hicolor/32x32/apps/kvirc.png share/icons/hicolor/32x32/apps/
-/usr/local/share/icons/hicolor/32x32/mimetypes/kvs.png share/icons/hicolor/32x32/mimetypes/
-/usr/local/share/icons/hicolor/48x48/apps/kvirc.png share/icons/hicolor/48x48/apps/
-/usr/local/share/icons/hicolor/48x48/mimetypes/kvs.png share/icons/hicolor/48x48/mimetypes/
-/usr/local/share/icons/hicolor/64x64/apps/kvirc.png share/icons/hicolor/64x64/apps/
-/usr/local/share/icons/hicolor/64x64/mimetypes/kvs.png share/icons/hicolor/64x64/mimetypes/
 /usr/local/share/kvirc share/
-/usr/local/share/mimelnk/text/x-kvs.desktop share/mimelnk/text/
-/usr/local/share/services/kvirc.protocol share/services/
-/usr/local/share/services/kvirc6.protocol share/services/
+/usr/local/bin/kio* bin/
+/usr/local/bin/*dcop* bin/
+/usr/local/bin/*arts* bin/
+/usr/local/lib/kde3/*kio* autolibs/kde3/
+/usr/local/lib/kde3/*knoti* autolibs/kde3/
+/usr/local/lib/kde3/kded* autolibs/kde3/
+/usr/local/share/apps share/
+/usr/local/share/config.kcfg share/config.kcfg
+/usr/local/share/config share/config
+/usr/local/share/services share/services
+/usr/local/share/servicetypes share/servicetypes
+/usr/local/share/mime share/mime
+/usr/local/share/mimelnk share/mimelnk
+/usr/local/libexec/gam* libexec/
+/usr/local/share/icons share/

Modified: pbibuild/modules/kvirc/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/kvirc/overlay-dir/PBI.FirstRun.sh	2009-02-02 22:09:48 UTC (rev 3402)
+++ pbibuild/modules/kvirc/overlay-dir/PBI.FirstRun.sh	2009-02-02 22:27:25 UTC (rev 3403)
@@ -16,33 +16,3 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-
-if [ -e "/usr/local/bin/kvirc" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/kvirc | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "KVIrc is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/kvirc | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep KVIrc 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "KVIrc could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "KVIrc 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 "KVIrc is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/kvirc/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/kvirc/overlay-dir/PBI.RemoveScript.sh	2009-02-02 22:09:48 UTC (rev 3402)
+++ pbibuild/modules/kvirc/overlay-dir/PBI.RemoveScript.sh	2009-02-02 22:27:25 UTC (rev 3403)
@@ -6,28 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/kvi_run_netscape.sh
-rm -fR /usr/local/bin/kvi_search_help.sh
-rm -fR /usr/local/bin/kvirc
-rm -fR /usr/local/bin/kvirc-config
-rm -fR /usr/local/include/kvirc
-rm -fR /usr/local/lib/libkvilib.a
-rm -fR /usr/local/lib/libkvilib.la
-rm -fR /usr/local/lib/libkvilib.so
-rm -fR /usr/local/lib/libkvilib.so.3
-#rm -fR /usr/local/share/applnk/Internet/kvirc.desktop
-rm -fR /usr/local/share/icons/hicolor/16x16/apps/kvirc.png
-rm -fR /usr/local/share/icons/hicolor/16x16/mimetypes/kvs.png
-rm -fR /usr/local/share/icons/hicolor/32x32/apps/kvirc.png
-rm -fR /usr/local/share/icons/hicolor/32x32/mimetypes/kvs.png
-rm -fR /usr/local/share/icons/hicolor/48x48/apps/kvirc.png
-rm -fR /usr/local/share/icons/hicolor/48x48/mimetypes/kvs.png
-rm -fR /usr/local/share/icons/hicolor/64x64/apps/kvirc.png
-rm -fR /usr/local/share/icons/hicolor/64x64/mimetypes/kvs.png
-rm -fR /usr/local/share/kvirc
-#rm -fR /usr/local/share/mimelnk/text/x-kvs.desktop
-rm -fR /usr/local/share/services/kvirc.protocol
-rm -fR /usr/local/share/services/kvirc6.protocol
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/kvirc/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/kvirc/overlay-dir/PBI.SetupScript.sh	2009-02-02 22:09:48 UTC (rev 3402)
+++ pbibuild/modules/kvirc/overlay-dir/PBI.SetupScript.sh	2009-02-02 22:27:25 UTC (rev 3403)
@@ -14,26 +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/kvi_run_netscape.sh /usr/local/bin/kvi_run_netscape.sh
-ln -s /Programs/${PROGDIR}/.sbin/kvi_search_help.sh /usr/local/bin/kvi_search_help.sh
-ln -s /Programs/${PROGDIR}/.sbin/kvirc /usr/local/bin/kvirc
-ln -s /Programs/${PROGDIR}/.sbin/kvirc-config /usr/local/bin/kvirc-config
-ln -s /Programs/${PROGDIR}/include/kvirc /usr/local/include/kvirc
-ln -s /Programs/${PROGDIR}/lib/libkvilib.a /usr/local/lib/libkvilib.a
-ln -s /Programs/${PROGDIR}/lib/libkvilib.la /usr/local/lib/libkvilib.la
-ln -s /Programs/${PROGDIR}/lib/libkvilib.so /usr/local/lib/libkvilib.so
-ln -s /Programs/${PROGDIR}/lib/libkvilib.so.3 /usr/local/lib/libkvilib.so.3
-#ln -s /Programs/${PROGDIR}/share/applnk/Internet/kvirc.desktop /usr/local/share/applnk/Internet/kvirc.desktop
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/16x16/apps/kvirc.png /usr/local/share/icons/hicolor/16x16/apps/kvirc.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/16x16/mimetypes/kvs.png /usr/local/share/icons/hicolor/16x16/mimetypes/kvs.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/32x32/apps/kvirc.png /usr/local/share/icons/hicolor/32x32/apps/kvirc.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/32x32/mimetypes/kvs.png /usr/local/share/icons/hicolor/32x32/mimetypes/kvs.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/48x48/apps/kvirc.png /usr/local/share/icons/hicolor/48x48/apps/kvirc.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/48x48/mimetypes/kvs.png /usr/local/share/icons/hicolor/48x48/mimetypes/kvs.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/64x64/apps/kvirc.png /usr/local/share/icons/hicolor/64x64/apps/kvirc.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/64x64/mimetypes/kvs.png /usr/local/share/icons/hicolor/64x64/mimetypes/kvs.png
-ln -s /Programs/${PROGDIR}/share/kvirc /usr/local/share/kvirc
-#ln -s /Programs/${PROGDIR}/share/mimelnk/text/x-kvs.desktop /usr/local/share/mimelnk/text/x-kvs.desktop
-ln -s /Programs/${PROGDIR}/share/services/kvirc.protocol /usr/local/share/services/kvirc.protocol
-ln -s /Programs/${PROGDIR}/share/services/kvirc6.protocol /usr/local/share/services/kvirc6.protocol
-echo "LAUNCHCLOSE: /usr/local/bin/kvirc"
+
+# 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/kvirc"

Modified: pbibuild/modules/kvirc/pbi.conf
===================================================================
--- pbibuild/modules/kvirc/pbi.conf	2009-02-02 22:09:48 UTC (rev 3402)
+++ pbibuild/modules/kvirc/pbi.conf	2009-02-02 22:27:25 UTC (rev 3403)
@@ -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



More information about the Commits mailing list