[PC-BSD Commits] r2872 - in pbibuild/modules/smb4k: . overlay-dir

svn at pcbsd.org svn at pcbsd.org
Wed Oct 8 13:28:31 PDT 2008


Author: kris
Date: 2008-10-08 13:28:30 -0700 (Wed, 08 Oct 2008)
New Revision: 2872

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

Large cleanup of the smb4k module, should work again as a PBI



Modified: pbibuild/modules/smb4k/copy-files
===================================================================
--- pbibuild/modules/smb4k/copy-files	2008-10-08 20:14:17 UTC (rev 2871)
+++ pbibuild/modules/smb4k/copy-files	2008-10-08 20:28:30 UTC (rev 2872)
@@ -1,72 +1,17 @@
 /usr/local/bin/smb2awk bin/
 /usr/local/bin/smb2nsmbrc bin/
-/usr/local/bin/smb4k bin/
-/usr/local/bin/smb4k_cat bin/
-/usr/local/bin/smb4k_kill bin/
-/usr/local/bin/smb4k_mount bin/
-/usr/local/bin/smb4k_mv bin/
-/usr/local/bin/smb4k_umount bin/
-/usr/local/include/smb4k_konqplugin include/
-/usr/local/include/smb4kauthinfo include/
-/usr/local/include/smb4kauthoptions include/
-/usr/local/include/smb4kbookmark include/
-/usr/local/include/smb4kbookmarkeditor include/
-/usr/local/include/smb4kbookmarkhandler include/
-/usr/local/include/smb4kbookmarkmenuwidget include/
-/usr/local/include/smb4kbrowseractionmenu include/
-/usr/local/include/smb4kbrowserwidget include/
-/usr/local/include/smb4kbrowserwidgetitem include/
-/usr/local/include/smb4kcore include/
-/usr/local/include/smb4kcustomoptionsdialog include/
-/usr/local/include/smb4kdefs include/
-/usr/local/include/smb4kerror include/
-/usr/local/include/smb4kfileio include/
-/usr/local/include/smb4kglobal include/
-/usr/local/include/smb4khomesshareshandlet include/
-/usr/local/include/smb4kmountdialog include/
-/usr/local/include/smb4kmounter include/
-/usr/local/include/smb4knetworkitems include/
-/usr/local/include/smb4knetworkitemtooltip include/
-/usr/local/include/smb4knetworkoptions include/
-/usr/local/include/smb4koptionsdlg include/
-/usr/local/include/smb4kpasswordhandler include/
-/usr/local/include/smb4kpreviewdialog include/
-/usr/local/include/smb4kprint include/
-/usr/local/include/smb4kprintdialog include/
-/usr/local/include/smb4kprintinfo include/
-/usr/local/include/smb4krsyncoptions include/
-/usr/local/include/smb4ksambaoptions include/
-/usr/local/include/smb4ksambaoptionshandler include/
-/usr/local/include/smb4ksambaoptionsinfo include/
-/usr/local/include/smb4kscanner include/
-/usr/local/include/smb4ksearchdialog include/
-/usr/local/include/smb4kshare include/
-/usr/local/include/smb4kshareactionmenu include/
-/usr/local/include/smb4kshareoptions include/
-/usr/local/include/smb4ksharesmenuwidget include/
-/usr/local/include/smb4ksharetooltip include/
-/usr/local/include/smb4ksharewidget include/
-/usr/local/include/smb4ksharewidgetitem include/
-/usr/local/include/smb4ksuperuseroptions include/
-/usr/local/include/smb4ksynchronizer include/
-/usr/local/include/smb4kuser include/
-/usr/local/include/smb4kuserinterfaceoptions include/
-/usr/local/lib/libsmb4kcore.a lib/
-/usr/local/lib/libsmb4kcore.la lib/
-/usr/local/lib/libsmb4kcore.so lib/
-/usr/local/lib/libsmb4kcore.so.1 lib/
-/usr/local/lib/libsmb4kwidgets.a lib/
-/usr/local/lib/libsmb4kwidgets.la lib/
-/usr/local/lib/libsmb4kwidgets.so lib/
-/usr/local/lib/libsmb4kwidgets.so.1 lib/
-/usr/local/lib/kde3/konqsidebar_smb4k.a lib/kde3/
-/usr/local/lib/kde3/konqsidebar_smb4k.la lib/kde3/
-/usr/local/lib/kde3/konqsidebar_smb4k.so lib/kde3/
-/usr/local/share/applications/kde/smb4k.desktop share/applications/kde/
-/usr/local/share/apps/smb4k share/apps/
-/usr/local/share/apps/konqsidebartng/add/smb4k_add.desktop share/apps/konqsidebartng/add/
-/usr/local/share/doc/HTML/en/smb4k share/doc/HTML/en/
-/usr/local/share/icons/crystalsvg/16x16/apps/smb4k.png share/icons/crystalsvg/16x16/apps/
-/usr/local/share/icons/crystalsvg/32x32/apps/smb4k.png share/icons/crystalsvg/32x32/apps/
-/usr/local/share/icons/crystalsvg/48x48/apps/smb4k.png share/icons/crystalsvg/48x48/apps/
+/usr/local/bin/smb4* bin/
+/usr/local/include/smb4k* include/
+/usr/local/lib/libsmb4k* autolibs/
+/usr/local/lib/kde3/*smb4k* lib/kde3/
+/usr/local/share/applications/kde/smb4k.desktop share/applications/kde/
+/usr/local/share/apps/smb4k share/apps/
+/usr/local/share/apps/konqsidebartng/add/smb4k_add.desktop share/apps/konqsidebartng/add/
+/usr/local/share/apps/smb4knetworkbrowserpart share/apps/
+/usr/local/share/apps/smb4ksharesiconviewpart share/apps/
+/usr/local/share/apps/smb4kshareslistviewpart share/apps/
+/usr/local/share/doc/HTML/en/smb4k share/doc/HTML/en/
+/usr/local/share/icons/crystalsvg/16x16/apps/smb4k.png share/icons/crystalsvg/16x16/apps/
+/usr/local/share/icons/crystalsvg/32x32/apps/smb4k.png share/icons/crystalsvg/32x32/apps/
+/usr/local/share/icons/crystalsvg/48x48/apps/smb4k.png share/icons/crystalsvg/48x48/apps/
 /usr/local/share/icons/crystalsvg/64x64/apps/smb4k.png share/icons/crystalsvg/64x64/apps/

Modified: pbibuild/modules/smb4k/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/smb4k/overlay-dir/PBI.RemoveScript.sh	2008-10-08 20:14:17 UTC (rev 2871)
+++ pbibuild/modules/smb4k/overlay-dir/PBI.RemoveScript.sh	2008-10-08 20:28:30 UTC (rev 2872)
@@ -14,62 +14,6 @@
 rm -fR /usr/local/bin/smb4k_mount
 rm -fR /usr/local/bin/smb4k_mv
 rm -fR /usr/local/bin/smb4k_umount
-rm -fR /usr/local/include/smb4k_konqplugin
-rm -fR /usr/local/include/smb4kauthinfo
-rm -fR /usr/local/include/smb4kauthoptions
-rm -fR /usr/local/include/smb4kbookmark
-rm -fR /usr/local/include/smb4kbookmarkeditor
-rm -fR /usr/local/include/smb4kbookmarkhandler
-rm -fR /usr/local/include/smb4kbookmarkmenuwidget
-rm -fR /usr/local/include/smb4kbrowseractionmenu
-rm -fR /usr/local/include/smb4kbrowserwidget
-rm -fR /usr/local/include/smb4kbrowserwidgetitem
-rm -fR /usr/local/include/smb4kcore
-rm -fR /usr/local/include/smb4kcustomoptionsdialog
-rm -fR /usr/local/include/smb4kdefs
-rm -fR /usr/local/include/smb4kerror
-rm -fR /usr/local/include/smb4kfileio
-rm -fR /usr/local/include/smb4kglobal
-rm -fR /usr/local/include/smb4khomesshareshandlet
-rm -fR /usr/local/include/smb4kmountdialog
-rm -fR /usr/local/include/smb4kmounter
-rm -fR /usr/local/include/smb4knetworkitems
-rm -fR /usr/local/include/smb4knetworkitemtooltip
-rm -fR /usr/local/include/smb4knetworkoptions
-rm -fR /usr/local/include/smb4koptionsdlg
-rm -fR /usr/local/include/smb4kpasswordhandler
-rm -fR /usr/local/include/smb4kpreviewdialog
-rm -fR /usr/local/include/smb4kprint
-rm -fR /usr/local/include/smb4kprintdialog
-rm -fR /usr/local/include/smb4kprintinfo
-rm -fR /usr/local/include/smb4krsyncoptions
-rm -fR /usr/local/include/smb4ksambaoptions
-rm -fR /usr/local/include/smb4ksambaoptionshandler
-rm -fR /usr/local/include/smb4ksambaoptionsinfo
-rm -fR /usr/local/include/smb4kscanner
-rm -fR /usr/local/include/smb4ksearchdialog
-rm -fR /usr/local/include/smb4kshare
-rm -fR /usr/local/include/smb4kshareactionmenu
-rm -fR /usr/local/include/smb4kshareoptions
-rm -fR /usr/local/include/smb4ksharesmenuwidget
-rm -fR /usr/local/include/smb4ksharetooltip
-rm -fR /usr/local/include/smb4ksharewidget
-rm -fR /usr/local/include/smb4ksharewidgetitem
-rm -fR /usr/local/include/smb4ksuperuseroptions
-rm -fR /usr/local/include/smb4ksynchronizer
-rm -fR /usr/local/include/smb4kuser
-rm -fR /usr/local/include/smb4kuserinterfaceoptions
-rm -fR /usr/local/lib/libsmb4kcore.a
-rm -fR /usr/local/lib/libsmb4kcore.la
-rm -fR /usr/local/lib/libsmb4kcore.so
-rm -fR /usr/local/lib/libsmb4kcore.so.1
-rm -fR /usr/local/lib/libsmb4kwidgets.a
-rm -fR /usr/local/lib/libsmb4kwidgets.la
-rm -fR /usr/local/lib/libsmb4kwidgets.so
-rm -fR /usr/local/lib/libsmb4kwidgets.so.1
-rm -fR /usr/local/lib/kde3/konqsidebar_smb4k.a
-rm -fR /usr/local/lib/kde3/konqsidebar_smb4k.la
-rm -fR /usr/local/lib/kde3/konqsidebar_smb4k.so
 rm -fR /usr/local/share/applications/kde/smb4k.desktop
 rm -fR /usr/local/share/apps/smb4k
 rm -fR /usr/local/share/apps/konqsidebartng/add/smb4k_add.desktop
@@ -87,6 +31,14 @@
   rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
 done
 
+if [ -d "/Programs/${PROGDIR}/lib/kde3" ]
+then
+ cd /Programs/${PROGDIR}/lib/kde3
+ for i in `ls`
+ do
+  rm /usr/local/lib/kde3/${i}
+ done
+fi
 
 if [ ! -z "$DISPLAY" ]
 then

Modified: pbibuild/modules/smb4k/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/smb4k/overlay-dir/PBI.SetupScript.sh	2008-10-08 20:14:17 UTC (rev 2871)
+++ pbibuild/modules/smb4k/overlay-dir/PBI.SetupScript.sh	2008-10-08 20:28:30 UTC (rev 2872)
@@ -22,63 +22,6 @@
 ln -s /Programs/${PROGDIR}/.sbin/smb4k_mount /usr/local/bin/smb4k_mount
 ln -s /Programs/${PROGDIR}/.sbin/smb4k_mv /usr/local/bin/smb4k_mv
 ln -s /Programs/${PROGDIR}/.sbin/smb4k_umount /usr/local/bin/smb4k_umount
-ln -s /Programs/${PROGDIR}/include/smb4k_konqplugin /usr/local/include/smb4k_konqplugin
-ln -s /Programs/${PROGDIR}/include/smb4kauthinfo /usr/local/include/smb4kauthinfo
-ln -s /Programs/${PROGDIR}/include/smb4kauthoptions /usr/local/include/smb4kauthoptions
-ln -s /Programs/${PROGDIR}/include/smb4kbookmark /usr/local/include/smb4kbookmark
-ln -s /Programs/${PROGDIR}/include/smb4kbookmarkeditor /usr/local/include/smb4kbookmarkeditor
-ln -s /Programs/${PROGDIR}/include/smb4kbookmarkhandler /usr/local/include/smb4kbookmarkhandler
-ln -s /Programs/${PROGDIR}/include/smb4kbookmarkmenuwidget /usr/local/include/smb4kbookmarkmenuwidget
-ln -s /Programs/${PROGDIR}/include/smb4kbrowseractionmenu /usr/local/include/smb4kbrowseractionmenu
-ln -s /Programs/${PROGDIR}/include/smb4kbrowserwidget /usr/local/include/smb4kbrowserwidget
-ln -s /Programs/${PROGDIR}/include/smb4kbrowserwidgetitem /usr/local/include/smb4kbrowserwidgetitem
-ln -s /Programs/${PROGDIR}/include/smb4kcore /usr/local/include/smb4kcore
-ln -s /Programs/${PROGDIR}/include/smb4kcustomoptionsdialog /usr/local/include/smb4kcustomoptionsdialog
-ln -s /Programs/${PROGDIR}/include/smb4kdefs /usr/local/include/smb4kdefs
-ln -s /Programs/${PROGDIR}/include/smb4kerror /usr/local/include/smb4kerror
-ln -s /Programs/${PROGDIR}/include/smb4kfileio /usr/local/include/smb4kfileio
-ln -s /Programs/${PROGDIR}/include/smb4kglobal /usr/local/include/smb4kglobal
-ln -s /Programs/${PROGDIR}/include/smb4khomesshareshandlet /usr/local/include/smb4khomesshareshandlet
-ln -s /Programs/${PROGDIR}/include/smb4kmountdialog /usr/local/include/smb4kmountdialog
-ln -s /Programs/${PROGDIR}/include/smb4kmounter /usr/local/include/smb4kmounter
-ln -s /Programs/${PROGDIR}/include/smb4knetworkitems /usr/local/include/smb4knetworkitems
-ln -s /Programs/${PROGDIR}/include/smb4knetworkitemtooltip /usr/local/include/smb4knetworkitemtooltip
-ln -s /Programs/${PROGDIR}/include/smb4knetworkoptions /usr/local/include/smb4knetworkoptions
-ln -s /Programs/${PROGDIR}/include/smb4koptionsdlg /usr/local/include/smb4koptionsdlg
-ln -s /Programs/${PROGDIR}/include/smb4kpasswordhandler /usr/local/include/smb4kpasswordhandler
-ln -s /Programs/${PROGDIR}/include/smb4kpreviewdialog /usr/local/include/smb4kpreviewdialog
-ln -s /Programs/${PROGDIR}/include/smb4kprint /usr/local/include/smb4kprint
-ln -s /Programs/${PROGDIR}/include/smb4kprintdialog /usr/local/include/smb4kprintdialog
-ln -s /Programs/${PROGDIR}/include/smb4kprintinfo /usr/local/include/smb4kprintinfo
-ln -s /Programs/${PROGDIR}/include/smb4krsyncoptions /usr/local/include/smb4krsyncoptions
-ln -s /Programs/${PROGDIR}/include/smb4ksambaoptions /usr/local/include/smb4ksambaoptions
-ln -s /Programs/${PROGDIR}/include/smb4ksambaoptionshandler /usr/local/include/smb4ksambaoptionshandler
-ln -s /Programs/${PROGDIR}/include/smb4ksambaoptionsinfo /usr/local/include/smb4ksambaoptionsinfo
-ln -s /Programs/${PROGDIR}/include/smb4kscanner /usr/local/include/smb4kscanner
-ln -s /Programs/${PROGDIR}/include/smb4ksearchdialog /usr/local/include/smb4ksearchdialog
-ln -s /Programs/${PROGDIR}/include/smb4kshare /usr/local/include/smb4kshare
-ln -s /Programs/${PROGDIR}/include/smb4kshareactionmenu /usr/local/include/smb4kshareactionmenu
-ln -s /Programs/${PROGDIR}/include/smb4kshareoptions /usr/local/include/smb4kshareoptions
-ln -s /Programs/${PROGDIR}/include/smb4ksharesmenuwidget /usr/local/include/smb4ksharesmenuwidget
-ln -s /Programs/${PROGDIR}/include/smb4ksharetooltip /usr/local/include/smb4ksharetooltip
-ln -s /Programs/${PROGDIR}/include/smb4ksharewidget /usr/local/include/smb4ksharewidget
-ln -s /Programs/${PROGDIR}/include/smb4ksharewidgetitem /usr/local/include/smb4ksharewidgetitem
-ln -s /Programs/${PROGDIR}/include/smb4ksuperuseroptions /usr/local/include/smb4ksuperuseroptions
-ln -s /Programs/${PROGDIR}/include/smb4ksynchronizer /usr/local/include/smb4ksynchronizer
-ln -s /Programs/${PROGDIR}/include/smb4kuser /usr/local/include/smb4kuser
-ln -s /Programs/${PROGDIR}/include/smb4kuserinterfaceoptions /usr/local/include/smb4kuserinterfaceoptions
-ln -s /Programs/${PROGDIR}/lib/libsmb4kcore.a /usr/local/lib/libsmb4kcore.a
-ln -s /Programs/${PROGDIR}/lib/libsmb4kcore.la /usr/local/lib/libsmb4kcore.la
-ln -s /Programs/${PROGDIR}/lib/libsmb4kcore.so /usr/local/lib/libsmb4kcore.so
-ln -s /Programs/${PROGDIR}/lib/libsmb4kcore.so.1 /usr/local/lib/libsmb4kcore.so.1
-ln -s /Programs/${PROGDIR}/lib/libsmb4kwidgets.a /usr/local/lib/libsmb4kwidgets.a
-ln -s /Programs/${PROGDIR}/lib/libsmb4kwidgets.la /usr/local/lib/libsmb4kwidgets.la
-ln -s /Programs/${PROGDIR}/lib/libsmb4kwidgets.so /usr/local/lib/libsmb4kwidgets.so
-ln -s /Programs/${PROGDIR}/lib/libsmb4kwidgets.so.1 /usr/local/lib/libsmb4kwidgets.so.1
-ln -s /Programs/${PROGDIR}/lib/kde3/konqsidebar_smb4k.a /usr/local/lib/kde3/konqsidebar_smb4k.a
-ln -s /Programs/${PROGDIR}/lib/kde3/konqsidebar_smb4k.la /usr/local/lib/kde3/konqsidebar_smb4k.la
-ln -s /Programs/${PROGDIR}/lib/kde3/konqsidebar_smb4k.so /usr/local/lib/kde3/konqsidebar_smb4k.so
-ln -s /Programs/${PROGDIR}/share/applications/kde/smb4k.desktop /usr/local/share/applications/kde/smb4k.desktop
 ln -s /Programs/${PROGDIR}/share/apps/smb4k /usr/local/share/apps/smb4k
 ln -s /Programs/${PROGDIR}/share/apps/konqsidebartng/add/smb4k_add.desktop /usr/local/share/apps/konqsidebartng/add/smb4k_add.desktop
 ln -s /Programs/${PROGDIR}/share/doc/HTML/en/smb4k /usr/local/share/doc/HTML/en/smb4k
@@ -87,7 +30,13 @@
 ln -s /Programs/${PROGDIR}/share/icons/crystalsvg/48x48/apps/smb4k.png /usr/local/share/icons/crystalsvg/48x48/apps/smb4k.png
 ln -s /Programs/${PROGDIR}/share/icons/crystalsvg/64x64/apps/smb4k.png /usr/local/share/icons/crystalsvg/64x64/apps/smb4k.png
 
+cd /Programs/${PROGDIR}/lib/kde3
+for i in `ls`
+do
+  ln -s /Programs/${PROGDIR}/lib/kde3/${i} /usr/local/lib/kde3/${i}
+done
 
+
 # Copy over all the LANG files
 LANGFILE="smb4k.mo"
 cd /Programs/${PROGDIR}/locale

Modified: pbibuild/modules/smb4k/pbi.conf
===================================================================
--- pbibuild/modules/smb4k/pbi.conf	2008-10-08 20:14:17 UTC (rev 2871)
+++ pbibuild/modules/smb4k/pbi.conf	2008-10-08 20:28:30 UTC (rev 2872)
@@ -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="04"
+BUILDKEY="14"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list