[PC-BSD Commits] r3188 - in pbibuild/modules/bacula-bat: . overlay-dir

svn at pcbsd.org svn at pcbsd.org
Wed Jan 7 06:52:14 PST 2009


Author: kris
Date: 2009-01-07 06:52:14 -0800 (Wed, 07 Jan 2009)
New Revision: 3188

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

Fixed up bacula-bat, now it includes the kmdr-executor binary, so we don't need to prompt the user for it anymore :)



Modified: pbibuild/modules/bacula-bat/copy-files
===================================================================
--- pbibuild/modules/bacula-bat/copy-files	2009-01-07 14:37:11 UTC (rev 3187)
+++ pbibuild/modules/bacula-bat/copy-files	2009-01-07 14:52:14 UTC (rev 3188)
@@ -1,2 +1,11 @@
-/usr/local/sbin/bat bin/
+/usr/local/bin/kmdr-* bin/
 /usr/local/etc/bat.conf.sample etc/
+/usr/local/sbin/b* bin/
+/usr/local/sbin/*bacula* bin/
+/usr/local/share/bacula share/
+/usr/local/share/apps share/
+/usr/local/share/config share/
+/usr/local/share/config.kcfg share/
+/usr/local/share/mimelnk share/
+/usr/local/lib/libkom* autolibs/
+/usr/local/lib/kde3/*kom* autolibs/kde3/

Modified: pbibuild/modules/bacula-bat/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/bacula-bat/overlay-dir/PBI.RemoveScript.sh	2009-01-07 14:37:11 UTC (rev 3187)
+++ pbibuild/modules/bacula-bat/overlay-dir/PBI.RemoveScript.sh	2009-01-07 14:52:14 UTC (rev 3188)
@@ -7,15 +7,3 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-man=/usr/local/man/man1/bat.1.gz
-bin=/usr/local/sbin/bat
-conf=/usr/local/etc/bat.conf.sample
-icon1=/usr/local/share/pixmaps/bat.png
-icon2=/usr/local/share/pixmaps/bat-sh.png
-icon3=/usr/local/share/pixmaps/bat-kommander.png
-for l in $man $bin $conf $icon1 $icon2 $icon3; do
-	# if it is linked, it was probably created by PBI
-	if [ -h "$l" ]; then
-		rm "$l"
-	fi
-done

Modified: pbibuild/modules/bacula-bat/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/bacula-bat/overlay-dir/PBI.SetupScript.sh	2009-01-07 14:37:11 UTC (rev 3187)
+++ pbibuild/modules/bacula-bat/overlay-dir/PBI.SetupScript.sh	2009-01-07 14:52:14 UTC (rev 3188)
@@ -15,10 +15,16 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-kdialog --msgbox "Bat is executed with script bat.sh which searches Bat configurations from ~/.bacula-bat by default. Please create the folder and put your configurations in there\!\nIn order to be able to use the GUI configuration chooser dialog, you need 'kmdr-executor' (or 'kommander' in case of Kommander KDE4) from Kommander package.\nKommander can be found in FreeBSD's 'kdewebdev' package or in PC-BSD's 'Software Development Kit' system component.\n\nIf you have Kommander's KDE4 version, it may have some issues with current GUI dialog!"
+# 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
 
 ln -s /Programs/${PROGDIR}/.sbin/bat /usr/local/sbin/bat
-ln -s /Programs/${PROGDIR}/man/man1/bat.1.gz /usr/local/man/man1/bat.1.gz
-ln -s /Programs/${PROGDIR}/etc/bat.conf.sample /usr/local/etc/bat.conf.sample
-ln -s /Programs/${PROGDIR}/share/pixmaps/* /usr/local/share/pixmaps/
+
+kdialog --msgbox "Bat is executed with script bat.sh which searches Bat configurations from ~/.bacula-bat by default. Please create the folder and put your configurations in there!"
+
 echo "LAUNCHCLOSE: /Programs/${PROGDIR}/.sbin/bat-kommander.sh"

Modified: pbibuild/modules/bacula-bat/pbi.conf
===================================================================
--- pbibuild/modules/bacula-bat/pbi.conf	2009-01-07 14:37:11 UTC (rev 3187)
+++ pbibuild/modules/bacula-bat/pbi.conf	2009-01-07 14:52:14 UTC (rev 3188)
@@ -31,7 +31,8 @@
 # Other Ports we need built
 # One per line, any additional ports that need to be built for this PBI
 # After building unnecessary bacula-server, let's build bacula-bat too :)
-OTHERPORT="/usr/ports/sysutils/bacula-bat"
+OTHERPORT="/usr/ports/sysutils/bacula-bat
+/usr/ports/www/kdewebdev"
 
 # Enter your custom make options here
 # Options that will be put into the make.conf for the build of this port
@@ -39,7 +40,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="1.4"
+BUILDKEY="01"
 
 # If this port has a non-standard port version variable in Makefile, then
 # list the key here such as "OOOVERSION="



More information about the Commits mailing list