[PC-BSD Commits] r3362 - in pbibuild/modules/kmldonkey: . kmenu-dir overlay-dir

svn at pcbsd.org svn at pcbsd.org
Thu Jan 29 11:02:23 PST 2009


Author: kris
Date: 2009-01-29 11:02:22 -0800 (Thu, 29 Jan 2009)
New Revision: 3362

Modified:
   pbibuild/modules/kmldonkey/build.sh
   pbibuild/modules/kmldonkey/copy-files
   pbibuild/modules/kmldonkey/kmenu-dir/kmldonkey
   pbibuild/modules/kmldonkey/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/kmldonkey/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/kmldonkey/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/kmldonkey/overlay-dir/mldonkeyrc
   pbibuild/modules/kmldonkey/pbi.conf
Log:

Updated kmldonkey, now 100% self-contained, runs on 7.0.x and 7.1



Modified: pbibuild/modules/kmldonkey/build.sh
===================================================================
--- pbibuild/modules/kmldonkey/build.sh	2009-01-29 18:37:29 UTC (rev 3361)
+++ pbibuild/modules/kmldonkey/build.sh	2009-01-29 19:02:22 UTC (rev 3362)
@@ -9,16 +9,11 @@
 #   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
+# Save the right version number in the removepbi.sh script
+sed -e "s,CHANGEME,KMLDonkey${PORTVER},g" ${PBIDIR}/mldonkeyrc > /tmp/sed
+mv /tmp/sed ${PBIDIR}/mldonkeyrc
 
+# Update our kmldonkey wrapper script
+sed -e "s,CHANGEME,KMLDonkey${PORTVER},g" ${PBIDIR}/bin/kmldonkey.sh > /tmp/sed
+mv /tmp/sed ${PBIDIR}/bin/kmldonkey.sh
+chmod 755 ${PBIDIR}/bin/kmldonkey.sh

Modified: pbibuild/modules/kmldonkey/copy-files
===================================================================
--- pbibuild/modules/kmldonkey/copy-files	2009-01-29 18:37:29 UTC (rev 3361)
+++ pbibuild/modules/kmldonkey/copy-files	2009-01-29 19:02:22 UTC (rev 3362)
@@ -1,46 +1,16 @@
-/usr/local/bin/kmldonkey bin/
-/usr/local/bin/kmldonkey_submit bin/
-/usr/local/bin/mld_hash bin/
-/usr/local/bin/mldonkey_previewer bin/
-/usr/local/bin/mlgui bin/
-/usr/local/bin/mlguistarter bin/
-/usr/local/bin/mlnet bin/
-/usr/local/bin/mlnet+gui bin/
-/usr/local/bin/mlnet-real bin/
-/usr/local/etc/rc.d/mlnet etc/rc.d/
+/usr/local/bin/kml* bin/
+/usr/local/bin/ml* bin/
+/usr/local/bin/kio* bin/
+/usr/local/bin/*dcop* bin/
+/usr/local/bin/*arts* bin/
 /usr/local/share/doc/mldonkey share/doc/
 /usr/local/share/examples/mldonkey share/examples/
 /usr/local/include/kmldonkey include/
-/usr/local/lib/libkmldonkey.a lib/
-/usr/local/lib/libkmldonkey.la lib/
-/usr/local/lib/libkmldonkey.so lib/
-/usr/local/lib/libkmldonkey.so.4 lib/
-/usr/local/lib/libkmldonkeytools.a lib/
-/usr/local/lib/libkmldonkeytools.la lib/
-/usr/local/lib/libkmldonkeytools.so lib/
-/usr/local/lib/libkmldonkeytools.so.0 lib/
-/usr/local/lib/kde3/kcm_kcmdonkey.a lib/kde3/
-/usr/local/lib/kde3/kcm_kcmdonkey.la lib/kde3/
-/usr/local/lib/kde3/kcm_kcmdonkey.so lib/kde3/
-/usr/local/lib/kde3/kded_kmldonkeyd.a lib/kde3/
-/usr/local/lib/kde3/kded_kmldonkeyd.la lib/kde3/
-/usr/local/lib/kde3/kded_kmldonkeyd.so lib/kde3/
-/usr/local/lib/kde3/kio_mldonkey.a lib/kde3/
-/usr/local/lib/kde3/kio_mldonkey.la lib/kde3/
-/usr/local/lib/kde3/kio_mldonkey.so lib/kde3/
-/usr/local/lib/kde3/kmldonkey_debugpage.a lib/kde3/
-/usr/local/lib/kde3/kmldonkey_debugpage.la lib/kde3/
-/usr/local/lib/kde3/kmldonkey_debugpage.so lib/kde3/
-/usr/local/lib/kde3/mldonkey_panelapplet.a lib/kde3/
-/usr/local/lib/kde3/mldonkey_panelapplet.la lib/kde3/
-/usr/local/lib/kde3/mldonkey_panelapplet.so lib/kde3/
+/usr/local/lib/libkml* lib/
+/usr/local/lib/*kcm* lib/
+/usr/local/lib/kde3 lib/
 /usr/local/man/man1/kmldonkey.1.gz man/man1/
 /usr/local/man/man1/kmldonkey_submit.1.gz man/man1/
-/usr/local/share/applnk/Internet/kmldonkey.desktop share/applnk/Internet/
-/usr/local/share/applnk/Settings/Network/kcmdonkey.desktop share/applnk/Settings/Network/
-/usr/local/share/apps/kmldonkey share/apps/
-/usr/local/share/apps/konqueror/servicemenus/ed2k_slurp.desktop share/apps/konqueror/servicemenus/
-/usr/local/share/apps/mldonkeyapplet share/apps/
 /usr/local/share/doc/HTML/de/kmldonkey share/doc/HTML/de/
 /usr/local/share/doc/HTML/et/kmldonkey share/doc/HTML/et/
 /usr/local/share/doc/HTML/it/kmldonkey share/doc/HTML/it/
@@ -48,13 +18,6 @@
 /usr/local/share/doc/HTML/pt/kmldonkey share/doc/HTML/pt/
 /usr/local/share/doc/HTML/ru/kmldonkey share/doc/HTML/ru/
 /usr/local/share/doc/HTML/sv/kmldonkey share/doc/HTML/sv/
-/usr/local/share/services/ed2k.protocol share/services/
-/usr/local/share/services/kmldonkey_debugpage.desktop share/services/
-/usr/local/share/services/magnet.protocol share/services/
-/usr/local/share/services/mldonkey.protocol share/services/
-/usr/local/share/services/sig2dat.protocol share/services/
-/usr/local/share/services/kded/kmldonkeyd.desktop share/services/kded/
-/usr/local/share/servicetypes/kmldonkey_plugin.desktop share/servicetypes/
 /usr/local/share/icons/hicolor/128x128/apps/kmldonkey.png share/icons/hicolor/128x128/apps/
 /usr/local/share/icons/hicolor/128x128/apps/mldonkey.png share/icons/hicolor/128x128/apps/
 /usr/local/share/icons/hicolor/16x16/apps/kmldonkey.png share/icons/hicolor/16x16/apps/
@@ -68,4 +31,13 @@
 /usr/local/share/icons/hicolor/64x64/apps/kmldonkey.png share/icons/hicolor/64x64/apps/
 /usr/local/share/icons/hicolor/64x64/apps/mldonkey.png share/icons/hicolor/64x64/apps/
 /usr/local/share/icons/hicolor/128x128/apps/kmldonkey.png share/icons/hicolor/128x128/apps/
-/usr/local/share/icons/hicolor/128x128/apps/kmldonkey.png share/icons/hicolor/128x128/apps/
\ No newline at end of file
+/usr/local/share/icons/hicolor/128x128/apps/kmldonkey.png share/icons/hicolor/128x128/apps/
+/usr/local/share/apps share/
+/usr/local/share/applications 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/

Modified: pbibuild/modules/kmldonkey/kmenu-dir/kmldonkey
===================================================================
--- pbibuild/modules/kmldonkey/kmenu-dir/kmldonkey	2009-01-29 18:37:29 UTC (rev 3361)
+++ pbibuild/modules/kmldonkey/kmenu-dir/kmldonkey	2009-01-29 19:02:22 UTC (rev 3362)
@@ -1,4 +1,4 @@
-ExePath: bin/kmldonkey
+ExePath: bin/kmldonkey.sh
 ExeIcon: share/icons/hicolor/32x32/apps/kmldonkey.png
 ExeDescr: KMLDonkey
 ExeNoDesktop: 0

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

Modified: pbibuild/modules/kmldonkey/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/kmldonkey/overlay-dir/PBI.RemoveScript.sh	2009-01-29 18:37:29 UTC (rev 3361)
+++ pbibuild/modules/kmldonkey/overlay-dir/PBI.RemoveScript.sh	2009-01-29 19:02:22 UTC (rev 3362)
@@ -6,80 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/kmldonkey
-rm -fR /usr/local/bin/mlnet
-rm -fR /usr/local/bin/mlnet-real
-rm -fR /usr/local/include/kmldonkey
-rm -fR /usr/local/lib/libkmldonkey.a
-rm -fR /usr/local/lib/libkmldonkey.la
-rm -fR /usr/local/lib/libkmldonkey.so
-rm -fR /usr/local/lib/libkmldonkey.so.4
-rm -fR /usr/local/lib/libkmldonkeytools.a
-rm -fR /usr/local/lib/libkmldonkeytools.la
-rm -fR /usr/local/lib/libkmldonkeytools.so
-rm -fR /usr/local/lib/libkmldonkeytools.so.0
-rm -fR /usr/local/lib/kde3/kcm_kcmdonkey.a
-rm -fR /usr/local/lib/kde3/kcm_kcmdonkey.la
-rm -fR /usr/local/lib/kde3/kcm_kcmdonkey.so
-rm -fR /usr/local/lib/kde3/kded_kmldonkeyd.a
-rm -fR /usr/local/lib/kde3/kded_kmldonkeyd.la
-rm -fR /usr/local/lib/kde3/kded_kmldonkeyd.so
-rm -fR /usr/local/lib/kde3/kio_mldonkey.a
-rm -fR /usr/local/lib/kde3/kio_mldonkey.la
-rm -fR /usr/local/lib/kde3/kio_mldonkey.so
-rm -fR /usr/local/lib/kde3/kmldonkey_debugpage.a
-rm -fR /usr/local/lib/kde3/kmldonkey_debugpage.la
-rm -fR /usr/local/lib/kde3/kmldonkey_debugpage.so
-rm -fR /usr/local/lib/kde3/mldonkey_panelapplet.a
-rm -fR /usr/local/lib/kde3/mldonkey_panelapplet.la
-rm -fR /usr/local/lib/kde3/mldonkey_panelapplet.so
-rm -fR /usr/local/man/man1/kmldonkey.1.gz
-rm -fR /usr/local/man/man1/kmldonkey_submit.1.gz
-rm -fR /usr/local/share/applnk/Internet/kmldonkey.desktop
-rm -fR /usr/local/share/applnk/Settings/Network/kcmdonkey.desktop
-rm -fR /usr/local/share/apps/kmldonkey
-rm -fR /usr/local/share/apps/konqueror/servicemenus/ed2k_slurp.desktop
-rm -fR /usr/local/share/apps/mldonkeyapplet
-rm -fR /usr/local/share/doc/HTML/de/kmldonkey
-rm -fR /usr/local/share/doc/HTML/et/kmldonkey
-rm -fR /usr/local/share/doc/HTML/it/kmldonkey
-rm -fR /usr/local/share/doc/HTML/nl/kmldonkey
-rm -fR /usr/local/share/doc/HTML/pt/kmldonkey
-rm -fR /usr/local/share/doc/HTML/ru/kmldonkey
-rm -fR /usr/local/share/doc/HTML/sv/kmldonkey
-rm -fR /usr/local/share/examples/mldonkey
-rm -fR /usr/local/share//doc/mldonkey
-rm -fR /usr/local/share/services/ed2k.protocol
-rm -fR /usr/local/share/services/kmldonkey_debugpage.desktop
-rm -fR /usr/local/share/services/magnet.protocol
-rm -fR /usr/local/share/services/mldonkey.protocol
-rm -fR /usr/local/share/services/sig2dat.protocol
-rm -fR /usr/local/share/services/kded/kmldonkeyd.desktop
-rm -fR /usr/local/share/servicetypes/kmldonkey_plugin.desktop
-rm -fR /usr/local/share/icons/hicolor/128x128/apps/kmldonkey.png
-rm -fR /usr/local/share/icons/hicolor/128x128/apps/mldonkey.png
-rm -fR /usr/local/share/icons/hicolor/16x16/apps/kmldonkey.png
-rm -fR /usr/local/share/icons/hicolor/16x16/apps/mldonkey.png
-rm -fR /usr/local/share/icons/hicolor/22x22/apps/kmldonkey.png
-rm -fR /usr/local/share/icons/hicolor/22x22/apps/mldonkey.png
-rm -fR /usr/local/share/icons/hicolor/32x32/apps/kmldonkey.png
-rm -fR /usr/local/share/icons/hicolor/32x32/apps/mldonkey.png
-rm -fR /usr/local/share/icons/hicolor/48x48/apps/kmldonkey.png
-rm -fR /usr/local/share/icons/hicolor/48x48/apps/mldonkey.png
-rm -fR /usr/local/share/icons/hicolor/64x64/apps/kmldonkey.png
-rm -fR /usr/local/share/icons/hicolor/64x64/apps/mldonkey.png
-rm -fR /usr/local/share/icons/hicolor/128x128/apps/kmldonkey.png
-rm -fR /usr/local/share/icons/hicolor/128x128/apps/kmldonkey.png
-
-# Remove the old locale files since we are uninstalling
-LANGFILE="kmldonkey.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
-
-
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/kmldonkey/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/kmldonkey/overlay-dir/PBI.SetupScript.sh	2009-01-29 18:37:29 UTC (rev 3361)
+++ pbibuild/modules/kmldonkey/overlay-dir/PBI.SetupScript.sh	2009-01-29 19:02:22 UTC (rev 3362)
@@ -15,99 +15,36 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-ln -s /Programs/${PROGDIR}/.sbin/kmldonkey /usr/local/bin/kmldonkey
-###mldonkey
-ln -s /Programs/${PROGDIR}/bin/mlnet /usr/local/bin/mlnet
-ln -s /Programs/${PROGDIR}/bin/mlnet-real /usr/local/bin/mlnet-real
-ln -s /Programs/${PROGDIR}/share/doc/mldonkey /usr/local/share/doc/mldonkey
-ln -s /Programs/${PROGDIR}/share/examples/mldonkey /usr/local/share/examples/mldonkey
-###
-ln -s /Programs/${PROGDIR}/include/kmldonkey /usr/local/include/kmldonkey
-ln -s /Programs/${PROGDIR}/lib/libkmldonkey.a /usr/local/lib/libkmldonkey.a
-ln -s /Programs/${PROGDIR}/lib/libkmldonkey.la /usr/local/lib/libkmldonkey.la
-ln -s /Programs/${PROGDIR}/lib/libkmldonkey.so /usr/local/lib/libkmldonkey.so
-ln -s /Programs/${PROGDIR}/lib/libkmldonkey.so.4 /usr/local/lib/libkmldonkey.so.4
-ln -s /Programs/${PROGDIR}/lib/libkmldonkeytools.a /usr/local/lib/libkmldonkeytools.a
-ln -s /Programs/${PROGDIR}/lib/libkmldonkeytools.la /usr/local/lib/libkmldonkeytools.la
-ln -s /Programs/${PROGDIR}/lib/libkmldonkeytools.so /usr/local/lib/libkmldonkeytools.so
-ln -s /Programs/${PROGDIR}/lib/libkmldonkeytools.so.0 /usr/local/lib/libkmldonkeytools.so.0
-ln -s /Programs/${PROGDIR}/lib/kde3/kcm_kcmdonkey.a /usr/local/lib/kde3/kcm_kcmdonkey.a
-ln -s /Programs/${PROGDIR}/lib/kde3/kcm_kcmdonkey.la /usr/local/lib/kde3/kcm_kcmdonkey.la
-ln -s /Programs/${PROGDIR}/lib/kde3/kcm_kcmdonkey.so /usr/local/lib/kde3/kcm_kcmdonkey.so
-ln -s /Programs/${PROGDIR}/lib/kde3/kded_kmldonkeyd.a /usr/local/lib/kde3/kded_kmldonkeyd.a
-ln -s /Programs/${PROGDIR}/lib/kde3/kded_kmldonkeyd.la /usr/local/lib/kde3/kded_kmldonkeyd.la
-ln -s /Programs/${PROGDIR}/lib/kde3/kded_kmldonkeyd.so /usr/local/lib/kde3/kded_kmldonkeyd.so
-ln -s /Programs/${PROGDIR}/lib/kde3/kio_mldonkey.a /usr/local/lib/kde3/kio_mldonkey.a
-ln -s /Programs/${PROGDIR}/lib/kde3/kio_mldonkey.la /usr/local/lib/kde3/kio_mldonkey.la
-ln -s /Programs/${PROGDIR}/lib/kde3/kio_mldonkey.so /usr/local/lib/kde3/kio_mldonkey.so
-ln -s /Programs/${PROGDIR}/lib/kde3/kmldonkey_debugpage.a /usr/local/lib/kde3/kmldonkey_debugpage.a
-ln -s /Programs/${PROGDIR}/lib/kde3/kmldonkey_debugpage.la /usr/local/lib/kde3/kmldonkey_debugpage.la
-ln -s /Programs/${PROGDIR}/lib/kde3/kmldonkey_debugpage.so /usr/local/lib/kde3/kmldonkey_debugpage.so
-ln -s /Programs/${PROGDIR}/lib/kde3/mldonkey_panelapplet.a /usr/local/lib/kde3/mldonkey_panelapplet.a
-ln -s /Programs/${PROGDIR}/lib/kde3/mldonkey_panelapplet.la /usr/local/lib/kde3/mldonkey_panelapplet.la
-ln -s /Programs/${PROGDIR}/lib/kde3/mldonkey_panelapplet.so /usr/local/lib/kde3/mldonkey_panelapplet.so
-ln -s /Programs/${PROGDIR}/man/man1/kmldonkey.1.gz /usr/local/man/man1/kmldonkey.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/kmldonkey_submit.1.gz /usr/local/man/man1/kmldonkey_submit.1.gz
-ln -s /Programs/${PROGDIR}/share/applnk/Internet/kmldonkey.desktop /usr/local/share/applnk/Internet/kmldonkey.desktop
-ln -s /Programs/${PROGDIR}/share/applnk/Settings/Network/kcmdonkey.desktop /usr/local/share/applnk/Settings/Network/kcmdonkey.desktop
-ln -s /Programs/${PROGDIR}/share/apps/kmldonkey /usr/local/share/apps/kmldonkey
-ln -s /Programs/${PROGDIR}/share/apps/konqueror/servicemenus/ed2k_slurp.desktop /usr/local/share/apps/konqueror/servicemenus/ed2k_slurp.desktop
-ln -s /Programs/${PROGDIR}/share/apps/mldonkeyapplet /usr/local/share/apps/mldonkeyapplet
-ln -s /Programs/${PROGDIR}/share/doc/HTML/de/kmldonkey /usr/local/share/doc/HTML/de/kmldonkey
-ln -s /Programs/${PROGDIR}/share/doc/HTML/et/kmldonkey /usr/local/share/doc/HTML/et/kmldonkey
-ln -s /Programs/${PROGDIR}/share/doc/HTML/it/kmldonkey /usr/local/share/doc/HTML/it/kmldonkey
-ln -s /Programs/${PROGDIR}/share/doc/HTML/nl/kmldonkey /usr/local/share/doc/HTML/nl/kmldonkey
-ln -s /Programs/${PROGDIR}/share/doc/HTML/pt/kmldonkey /usr/local/share/doc/HTML/pt/kmldonkey
-ln -s /Programs/${PROGDIR}/share/doc/HTML/ru/kmldonkey /usr/local/share/doc/HTML/ru/kmldonkey
-ln -s /Programs/${PROGDIR}/share/doc/HTML/sv/kmldonkey /usr/local/share/doc/HTML/sv/kmldonkey
-ln -s /Programs/${PROGDIR}/share/services/ed2k.protocol /usr/local/share/services/ed2k.protocol
-ln -s /Programs/${PROGDIR}/share/services/kmldonkey_debugpage.desktop /usr/local/share/services/kmldonkey_debugpage.desktop
-ln -s /Programs/${PROGDIR}/share/services/magnet.protocol /usr/local/share/services/magnet.protocol
-ln -s /Programs/${PROGDIR}/share/services/mldonkey.protocol /usr/local/share/services/mldonkey.protocol
-ln -s /Programs/${PROGDIR}/share/services/sig2dat.protocol /usr/local/share/services/sig2dat.protocol
-ln -s /Programs/${PROGDIR}/share/services/kded/kmldonkeyd.desktop /usr/local/share/services/kded/kmldonkeyd.desktop
-ln -s /Programs/${PROGDIR}/share/servicetypes/kmldonkey_plugin.desktop /usr/local/share/servicetypes/kmldonkey_plugin.desktop
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/128x128/apps/kmldonkey.png /usr/local/share/icons/hicolor/128x128/apps/kmldonkey.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/128x128/apps/mldonkey.png /usr/local/share/icons/hicolor/128x128/apps/mldonkey.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/16x16/apps/kmldonkey.png /usr/local/share/icons/hicolor/16x16/apps/kmldonkey.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/16x16/apps/mldonkey.png /usr/local/share/icons/hicolor/16x16/apps/mldonkey.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/22x22/apps/kmldonkey.png /usr/local/share/icons/hicolor/22x22/apps/kmldonkey.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/22x22/apps/mldonkey.png /usr/local/share/icons/hicolor/22x22/apps/mldonkey.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/32x32/apps/kmldonkey.png /usr/local/share/icons/hicolor/32x32/apps/kmldonkey.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/32x32/apps/mldonkey.png /usr/local/share/icons/hicolor/32x32/apps/mldonkey.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/48x48/apps/kmldonkey.png /usr/local/share/icons/hicolor/48x48/apps/kmldonkey.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/48x48/apps/mldonkey.png /usr/local/share/icons/hicolor/48x48/apps/mldonkey.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/64x64/apps/kmldonkey.png /usr/local/share/icons/hicolor/64x64/apps/kmldonkey.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/64x64/apps/mldonkey.png /usr/local/share/icons/hicolor/64x64/apps/mldonkey.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/128x128/apps/kmldonkey.png /usr/local/share/icons/hicolor/128x128/apps/kmldonkey.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/128x128/apps/kmldonkey.png /usr/local/share/icons/hicolor/128x128/apps/kmldonkey.png
+# 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
 
-# Copy over all the LANG files
-LANGFILE="kmldonkey.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  mkdir -p /usr/local/share/locale/${i}/LC_MESSAGES >/dev/null 2>/dev/null
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
 
 # Now add the default mldonkeyrc file to all kde profiles
-cd /home
-for i in `ls`
+USERS="`cut -d ':' -f 1 /etc/passwd | grep -v '^#'`"
+for i in ${USERS}
 do
 
- if [ -e "${i}/.kde/share/config" ]
+  HOMEDIR="`cat /etc/passwd | grep ^${i}: | cut -d ":" -f 6`"
+
+ if [ -d "${HOMEDIR}/.kde/share/config" ]
  then
-   cp /Programs/${PROGDIR}/mldonkeyrc /home/${i}/.kde/share/config/
-   cp /Programs/${PROGDIR}/kmldonkeyrc /home/${i}/.kde/share/config/
-   chown ${i}:${i} /home/${i}/.kde/share/config/mldonkeyrc
-   chown ${i}:${i} /home/${i}/.kde/share/config/kmldonkeyrc
-   chmod 755 /home/${i}/.kde/share/config/mldonkeyrc
-   chmod 755 /home/${i}/.kde/share/config/kmldonkeyrc
-   mkdir /home/${i}/Downloads
-   chown ${i}:${i} /home/${i}/Downloads
+   cp /Programs/${PROGDIR}/mldonkeyrc ${HOMEDIR}/.kde/share/config/
+   cp /Programs/${PROGDIR}/kmldonkeyrc ${HOMEDIR}/.kde/share/config/
+   chown ${i}:${i} ${HOMEDIR}/.kde/share/config/mldonkeyrc
+   chown ${i}:${i} ${HOMEDIR}/.kde/share/config/kmldonkeyrc
+   chmod 755 ${HOMEDIR}/.kde/share/config/mldonkeyrc
+   chmod 755 ${HOMEDIR}/.kde/share/config/kmldonkeyrc
+   mkdir ${HOMEDIR}/Downloads
+   chown ${i}:${i} ${HOMEDIR}/Downloads
  fi
 
+
 done
 
-echo "LAUNCHCLOSE: /usr/local/bin/kmldonkey"
+echo "LAUNCHCLOSE: /Programs/bin/kmldonkey.sh"
+

Modified: pbibuild/modules/kmldonkey/overlay-dir/mldonkeyrc
===================================================================
--- pbibuild/modules/kmldonkey/overlay-dir/mldonkeyrc	2009-01-29 18:37:29 UTC (rev 3361)
+++ pbibuild/modules/kmldonkey/overlay-dir/mldonkeyrc	2009-01-29 19:02:22 UTC (rev 3362)
@@ -1,5 +1,5 @@
 [MLDonkey]
-BinaryPath=/usr/local/bin/mlnet
+BinaryPath[$e]=/Programs/CHANGEME/bin/mlnet
 Default=true
 DonkeyGuiPort=4001
 DonkeyHTTPPort=4080

Modified: pbibuild/modules/kmldonkey/pbi.conf
===================================================================
--- pbibuild/modules/kmldonkey/pbi.conf	2009-01-29 18:37:29 UTC (rev 3361)
+++ pbibuild/modules/kmldonkey/pbi.conf	2009-01-29 19:02:22 UTC (rev 3362)
@@ -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="25"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list