Merge branch 'master' of github.com:pcbsd/pcbsd

src-qt4/pc-bootconfig/mainUI.ui

@@ -6,13 +6,17 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>640</width>
-    <height>262</height>
+    <width>638</width>
+    <height>260</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>PC-BSD Bootup Configuration</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="pc-bootconfig.qrc">
+    <normaloff>:/pc-bootconfig.png</normaloff>:/pc-bootconfig.png</iconset>
+  </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout">
     <item>
@@ -386,8 +390,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>640</width>
-     <height>20</height>
+     <width>638</width>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">

src-qt4/pc-bootconfig/pc-bootconfig.qrc

@@ -1,17 +1,18 @@
 <RCC>
-  <qresource>
-    <file>icons/undo.png</file>
-    <file>icons/gear.png</file>
-    <file>icons/save.png</file>
-    <file>icons/folder.png</file>
-    <file>icons/minus.png</file>
-    <file>icons/add.png</file>
-    <file>icons/close.png</file>
-    <file>icons/copy.png</file>
-    <file>icons/new.png</file>
-    <file>icons/rename.png</file>
-    <file>icons/star.png</file>
-    <file>icons/sync.png</file>
-    <file>icons/plus.png</file>
-  </qresource>
+    <qresource prefix="/">
+        <file>icons/undo.png</file>
+        <file>icons/gear.png</file>
+        <file>icons/save.png</file>
+        <file>icons/folder.png</file>
+        <file>icons/minus.png</file>
+        <file>icons/add.png</file>
+        <file>icons/close.png</file>
+        <file>icons/copy.png</file>
+        <file>icons/new.png</file>
+        <file>icons/rename.png</file>
+        <file>icons/star.png</file>
+        <file>icons/sync.png</file>
+        <file>icons/plus.png</file>
+        <file>pc-bootconfig.png</file>
+    </qresource>
 </RCC>

src-qt4/pc-controlpanel/items/system/pc-gdmconf.desktop

@@ -5,7 +5,7 @@ Comment=
 Exec=pc-su pc-gdmconf
 TryExec=/usr/local/bin/pc-gdmconf
 Keywords="gdm,login,login window,auto login,autologin,xdmcp,remote login,login timout"
-Icon=/usr/local/share/pcbsd/icons/pc-dmconf.png
+Icon=/usr/local/share/pcbsd/icons/pc-gdmconf.png
 StartupNotify=true
 Terminal=false
 TerminalOptions=

src-qt4/pc-updategui/main.cpp

@@ -19,7 +19,7 @@ int main( int argc, char ** argv )
    QString langCode = mylocale.name();
    if ( ! QFile::exists( PREFIX + "/share/pcbsd/i18n/UpdateGUI_" + langCode + ".qm" ) )
      langCode.truncate(langCode.indexOf("_"));
-   translator.load( QString("UpdateGUI_") + langCode, PREFIX + "/share/pcbsd/i18n/" );
+   translator.load( QString("UpdateGui_") + langCode, PREFIX + "/share/pcbsd/i18n/" );
    a.installTranslator( &translator );
    qDebug() << "Locale:" << langCode;
 

src-qt4/port-files/pkg-plist

@@ -416,7 +416,6 @@ share/pcbsd/pc-controlpanel/items/system/lxde-lxtask.desktop
 share/pcbsd/pc-controlpanel/items/system/pcusermanager.desktop
 share/pcbsd/pc-controlpanel/items/system/ksystemlog.desktop
 share/pcbsd/pc-controlpanel/items/system/about.desktop
-share/pcbsd/pc-controlpanel/items/system/pc-updategui.desktop
 share/pcbsd/pc-controlpanel/items/system/pc-adsldap.desktop
 share/pcbsd/pc-controlpanel/items/system/webmin.desktop
 share/pcbsd/pc-controlpanel/items/system/pc-sysmanager.desktop
@@ -432,6 +431,7 @@ share/pcbsd/pc-controlpanel/items/tools/pbi-kbackup.desktop
 share/pcbsd/pc-controlpanel/items/tools/warden.desktop
 share/pcbsd/pc-controlpanel/items/tools/lifepreserver.desktop
 share/pcbsd/pc-controlpanel/items/tools/flash-player-properties.desktop
+share/pcbsd/pc-controlpanel/items/software/pc-updategui.desktop
 share/pcbsd/pc-controlpanel/items/software/pbi-winecfg.desktop
 share/pcbsd/pc-controlpanel/items/software/pbi-q4wine.desktop
 share/pcbsd/pc-controlpanel/items/software/pbi-kports.desktop

src-sh/libsh/functions.sh

@@ -242,7 +242,8 @@ get_file_from_mirrors()
       _time=`expr $_time + 1`
    done
 
-   _err="`cat ${_eFile}`"
+   _err="`cat ${_eFile} 2>/dev/null`"
+   if [ -z "$_err" ] ; then _err="0"; fi
    rm ${_eFile} 2>/dev/null
    if [ "$_err" = "0" ]; then echo "FETCHDONE" ; fi
    unset FETCH_PID
@@ -303,7 +304,8 @@ get_file() {
 			_time=`expr $_time + 2`
 		done
 
-		_err="`cat ${_eFile}`"
+		_err="`cat ${_eFile} 2>/dev/null`"
+		if [ -z "$_err" ] ; then _err="0"; fi
                 rm ${_eFile} 2>/dev/null
 		if [ "$_err" = "0" ]; then echo "FETCHDONE" ; fi
 		unset FETCH_PID

src-sh/pbi-manager/pbi-manager

@@ -7516,7 +7516,7 @@ getZFSTank() {
 }
 
 # Source our shared PCBSD functions
-if [ -z "$ALTPROGPREFIX" ] ; then
+if [ -n "$ALTPROGPREFIX" ] ; then
   . ${ALTPROGPREFIX}/share/pcbsd/scripts/functions.sh
 else
   . /usr/local/share/pcbsd/scripts/functions.sh

src-sh/pbi-manager10/install.sh

@@ -5,7 +5,7 @@
 verCheck="`grep '^#define __FreeBSD_version' /usr/include/sys/param.h | awk '{print $3}'`"
 if [ $verCheck -lt 1000000 ] ; then
   # This version is for FreeBSD >= 10
-  exit 0
+  #exit 0
 fi
 
 DEFAULT="/usr/local"
@@ -52,22 +52,22 @@ mkdir -p ${LB}/man/man1 >/dev/null 2>/dev/null
 for i in `ls man1/`
 do
   rm ${LB}/man/man1/${i}.gz >/dev/null 2>/dev/null
-  cp man1/${i} ${LB}/man/man1/${i}
+  gzip -c man1/${i} > ${LB}/man/man1/${i}.gz
 done
 
 mkdir -p ${LB}/man/man5 >/dev/null 2>/dev/null
 for i in `ls man5/`
 do
   rm ${LB}/man/man5/${i}.gz >/dev/null 2>/dev/null
-  cp man5/${i} ${LB}/man/man5/${i}
+  gzip -c man5/${i} > ${LB}/man/man5/${i}.gz
 done
 
 
 mkdir -p ${LB}/man/man8 >/dev/null 2>/dev/null
 for i in `ls man8/`
 do
   rm ${LB}/man/man8/${i}.gz >/dev/null 2>/dev/null
-  cp man8/${i} ${LB}/man/man8/${i}
+  gzip -c man8/${i} > ${LB}/man/man8/${i}.gz
 done
 
 if [ -d "${LB}/share/pbi-manager" ] ; then rm -rf "${LB}/share/pbi-manager" ; fi
@@ -82,9 +82,9 @@ cp ${DIR}/icons/default.png ${LB}/share/pbi-manager/icons
 cp ${DIR}/icons/patch.png ${LB}/share/pbi-manager/icons
 
 # If this is a new install, add the PC-BSD master repo
-if [ ! -d "/var/db/pbi/keys" ] ; then
-	pbi_addrepo ${DIR}/repo/pcbsd.rpo
-fi
+#if [ ! -d "/var/db/pbi/keys" ] ; then
+#	pbi_addrepo ${DIR}/repo/pcbsd.rpo
+#fi
 
 # Copy the default PC-BSD repo file
 cp ${DIR}/repo/pcbsd.rpo ${LB}/share/pbi-manager/pcbsd.rpo
@@ -96,20 +96,18 @@ ${LB}/sbin/pbi_info >/dev/null 2>/dev/null
 cp ${DIR}/rc.d/pbid ${LB}/etc/rc.d/pbid
 cp ${DIR}/etc/pbi.conf ${LB}/etc/pbi.conf
 
-if [ ! -d "/usr/pbi" ] ; then mkdir /usr/pbi ; fi
-
 # Create the wrapper binary
 cd ${DIR}/wrapper
 if [ `uname -m` = "amd64" ] ; then
   # Build 32bit wrapper
   echo "Building i386 wrapper..."
-  rm .pbiwrapper >/dev/null 2>/dev/null
+  rm pbiwrapper >/dev/null 2>/dev/null
   make clean
   make DEFINES="-mtune=i386 -march=i386 -m32"
   make install
-  chown root:wheel /usr/pbi/.pbiwrapper 
-  chmod 644 /usr/pbi/.pbiwrapper
-  mv /usr/pbi/.pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-i386
+  chown root:wheel pbiwrapper 
+  chmod 644 pbiwrapper
+  mv pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-i386
 else
   touch ${LB}/share/pbi-manager/.pbiwrapper-i386
 fi
@@ -118,10 +116,11 @@ fi
 echo "Building `uname -m` wrapper..."
 DEFINES=""
 export DEFINES
-rm .pbiwrapper >/dev/null 2>/dev/null
+rm pbiwrapper >/dev/null 2>/dev/null
 make clean
 make DEFINES=""
 make install DEFINES=""
-chown root:wheel /usr/pbi/.pbiwrapper 
-chmod 644 /usr/pbi/.pbiwrapper
-mv /usr/pbi/.pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-`uname -m`
+chown root:wheel pbiwrapper 
+chmod 644 pbiwrapper
+mv pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-`uname -m`
+cp ldconfig ${LB}/share/pbi-manager/ldconfig-pbi