Permalink
Browse files

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

  • Loading branch information...
Ken Moore
Ken Moore committed Sep 27, 2013
2 parents e0c368d + 813b031 commit eb70a807577c0fd3121f044f47e2141c56558346
Showing with 616 additions and 332 deletions.
  1. +93 −0 .gitignore
  2. +0 −1 build-files/ports-overlay/misc/pcbsd-base/Makefile
  3. +73 −0 mkports.sh
  4. +1 −1 src-qt4/EasyPBI/EasyPBI.pro
  5. +7 −7 src-qt4/PCDM/PCDM.pro
  6. +1 −1 src-qt4/about-gui/about-gui.pro
  7. +1 −1 src-qt4/libpcbsd/ui/ui.pro
  8. +1 −1 src-qt4/life-preserver/life-preserver.pro
  9. +6 −5 src-qt4/life-preserver/scripts/setup-ssh-keys.sh
  10. BIN src-qt4/pc-adsldap/pc-adsldap
  11. +1 −1 src-qt4/pc-adsldap/pc-adsldap.pro
  12. BIN src-qt4/pc-bluetoothmanager/pc-bluetoothmanager
  13. +1 −1 src-qt4/pc-bluetoothmanager/pc-bluetoothmanager.pro
  14. BIN src-qt4/pc-bluetoothtray/pc-bluetoothtray
  15. +1 −1 src-qt4/pc-bluetoothtray/pc-bluetoothtray.pro
  16. +2 −2 src-qt4/pc-bootconfig/pc-bootconfig.pro
  17. +6 −6 src-qt4/pc-controlpanel/pc-controlpanel.pro
  18. +1 −1 src-qt4/pc-crashhandler/pc-crashhandler.pro
  19. +1 −1 src-qt4/pc-cupscfg/pc-cupscfg.pro
  20. +1 −1 src-qt4/pc-dmconf/pc-dmconf.pro
  21. +1 −1 src-qt4/pc-firstbootgui/pc-firstbootgui.pro
  22. BIN src-qt4/pc-gdmconf/pc-gdmconf
  23. +1 −1 src-qt4/pc-gdmconf/pc-gdmconf.pro
  24. +2 −2 src-qt4/pc-installgui/pc-installgui.pro
  25. +13 −9 src-qt4/pc-installgui/scripts/setup-ssh-keys.sh
  26. +1 −1 src-qt4/pc-mounttray/pc-mounttray.pro
  27. +2 −2 src-qt4/pc-netmanager/src/NetworkManager/NetworkManager.pro
  28. +1 −1 src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.pro
  29. +1 −1 src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.pro
  30. +1 −1 src-qt4/pc-netmanager/src/wificonfig/wificonfig.pro
  31. +3 −3 src-qt4/pc-pbigui/mkdirs.sh
  32. +9 −6 src-qt4/pc-pbigui/pc-pbigui.pro
  33. +2 −0 src-qt4/pc-pbigui/resources/defaults.list
  34. +1 −1 src-qt4/pc-pfmanager/pc-pfmanager.pro
  35. +1 −1 src-qt4/pc-pkgmanager/pc-pkgmanager.pro
  36. +1 −1 src-qt4/pc-servicemanager/pc-servicemanager.pro
  37. +2 −2 src-qt4/pc-softwaremanager/pc-softwaremanager.pro
  38. +1 −1 src-qt4/pc-soundconfig/pc-soundconfig.pro
  39. +1 −1 src-qt4/pc-sysmanager/pc-sysmanager.pro
  40. +1 −1 src-qt4/pc-systemupdatertray/pc-systemupdatertray.pro
  41. +1 −1 src-qt4/pc-updategui/pc-updategui.pro
  42. +1 −1 src-qt4/pc-usermanager/pc-usermanager.pro
  43. +1 −1 src-qt4/pc-welcome/pc-welcome.pro
  44. +2 −4 src-qt4/pc-xgui/pc-xgui.pro
  45. +44 −0 src-qt4/pc-xgui/resources/settings/drivers.txt
  46. +8 −9 src-qt4/port-files/Makefile
  47. +9 −18 src-qt4/port-files/pkg-plist
  48. +1 −1 src-qt4/qsudo/qsudo.pro
  49. +2 −2 src-qt4/src-qt4.pro
  50. +1 −1 src-qt4/warden-gui/warden-gui.pro
  51. +3 −1 src-qt4/xtrafiles/Makefile
  52. +11 −1 src-qt4/xtrafiles/install.sh
  53. BIN src-qt4/xtrafiles/local/share/pcbsd/doc/handbook_en.pdf
  54. +1 −0 src-sh/Makefile
  55. +7 −7 src-sh/about/Makefile
  56. +10 −10 src-sh/de-info/Makefile
  57. +7 −6 src-sh/libsh/Makefile
  58. +3 −1 src-sh/lpreserver/Makefile
  59. +1 −0 src-sh/lpreserver/backend/functions.sh
  60. +10 −3 src-sh/lpreserver/install.sh
  61. +3 −1 src-sh/pbi-manager/Makefile
  62. +14 −16 src-sh/pbi-manager/install.sh
  63. +2 −0 src-sh/pbi-manager/man5/pbi.conf.5
  64. +5 −1 src-sh/pbi-manager/pbi-manager
  65. +2 −7 src-sh/pbi-manager/wrapper/Makefile
  66. +3 −1 src-sh/pbi-manager10/Makefile
  67. +1 −4 src-sh/pbi-manager10/wrapper/ldconfig
  68. +7 −6 src-sh/pbreg/Makefile
  69. +3 −1 src-sh/pc-adctl/bin/Makefile
  70. +2 −1 src-sh/pc-adctl/conf/Makefile
  71. +2 −1 src-sh/pc-adctl/pc-krbconf/Makefile
  72. +2 −1 src-sh/pc-adctl/pc-ldapconf/Makefile
  73. +2 −1 src-sh/pc-adctl/pc-nssconf/Makefile
  74. +2 −1 src-sh/pc-adctl/pc-nssldapconf/Makefile
  75. +2 −1 src-sh/pc-adctl/pc-pamconf/Makefile
  76. +2 −1 src-sh/pc-adctl/pc-sambaconf/Makefile
  77. +2 −1 src-sh/pc-adctl/rc/Makefile
  78. +2 −1 src-sh/pc-adctl/scripts/Makefile
  79. +7 −6 src-sh/pc-checkxdisplay/Makefile
  80. +3 −1 src-sh/pc-extractoverlay/Makefile
  81. +21 −13 src-sh/pc-extractoverlay/install.sh
  82. +6 −7 src-sh/pc-fbsdupdatecheck/Makefile
  83. +8 −6 src-sh/pc-firstgui/Makefile
  84. +12 −10 src-sh/pc-metapkgmanager/Makefile
  85. +8 −6 src-sh/pc-runxgui/Makefile
  86. +8 −7 src-sh/pc-su/Makefile
  87. +2 −1 src-sh/pc-sysinstall/Makefile
  88. +2 −2 src-sh/pc-sysinstall/backend/functions-networking.sh
  89. +4 −2 src-sh/pc-sysinstall/install.sh
  90. +12 −10 src-sh/pc-thinclient/Makefile
  91. +2 −2 src-sh/pc-thinclient/pc-thinclient
  92. +12 −10 src-sh/pc-updatemanager/Makefile
  93. +17 −17 src-sh/pc-xdgutil/Makefile
  94. +4 −20 src-sh/port-files/Makefile
  95. +6 −0 src-sh/port-files/pkg-install
  96. +21 −15 src-sh/port-files/pkg-plist
  97. +3 −1 src-sh/warden/Makefile
  98. +23 −14 src-sh/warden/install.sh
  99. +3 −1 src-sh/xtrafiles/Makefile
  100. +9 −1 src-sh/xtrafiles/install.sh
View
@@ -901,3 +901,96 @@ src-sh/pc-fbsdupdatecheck/pc-fbsdupdatecheck
src-qt4/pc-netmanager/src/NetworkManager/pc-netmanager
src-qt4/pc-mounttray/pc-mounttray
src-qt4/life-preserver/life-preserver
+src-qt4/about-gui/about-gui
+
+src-qt4/about-gui/ui_mainwindow.h
+src-qt4/pc-adsldap/ui_adsldap.h
+src-qt4/pc-bluetoothmanager/ui_btmaingui.h
+src-qt4/pc-bootconfig/Makefile
+src-qt4/pc-bootconfig/pc-bootconfig
+src-qt4/pc-bootconfig/ui_mainUI.h
+src-qt4/pc-bugreport/ui_maillist.h
+src-qt4/pc-bugreport/ui_mainwindow.h
+src-qt4/pc-bugreport/ui_showinfodialog.h
+src-qt4/pc-bugreport/ui_toolbox.h
+src-qt4/pc-bugreport/ui_weburl.h
+src-qt4/pc-controlpanel/pc-controlpanel
+src-qt4/pc-crashhandler/pbi-crashhandler-gui
+src-qt4/pc-crashhandler/ui_crashhandler.h
+src-qt4/pc-crashhandler/ui_details.h
+src-qt4/pc-gdmconf/ui_mainwindow.h
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_af.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_ar.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_az.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_bg.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_bn.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_bs.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_ca.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_cs.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_cy.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_da.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_de.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_el.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_en_GB.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_en_ZA.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_es.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_et.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_eu.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_fa.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_fi.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_fr.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_fr_CA.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_fur.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_gl.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_he.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_hi.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_hr.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_hu.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_id.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_is.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_it.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_ja.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_ka.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_ko.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_lt.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_lv.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_mk.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_mn.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_ms.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_mt.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_nb.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_ne.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_nl.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_pa.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_pl.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_pt.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_pt_BR.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_ro.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_ru.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_sa.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_sk.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_sl.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_sr.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_sv.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_sw.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_ta.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_tg.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_th.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_tr.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_uk.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_uz.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_vi.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_zh_CN.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_zh_HK.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_zh_TW.qm
+src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_zu.qm
+src-qt4/pc-netmanager/src/ethernetconfig/ui_ethernetconfig.h
+src-qt4/pc-netmanager/src/wificonfig/pc-wificonfig
+src-qt4/pc-netmanager/src/wificonfig/ui_dialogwpapersonal.h
+src-qt4/pc-netmanager/src/wificonfig/ui_wepconfig.h
+src-qt4/pc-netmanager/src/wificonfig/ui_wificonfigwidgetbase.h
+src-qt4/pc-netmanager/src/wificonfig/ui_wifiscanssid.h
+src-qt4/pc-netmanager/src/wificonfig/ui_wifiselectiondialog.h
+src-sh/pbi-manager/wrapper/.pbiwrapper
+src-sh/pbi-manager/wrapper/pbiwrapper
+src-sh/pbi-manager10/wrapper/.pbiwrapper
@@ -51,7 +51,6 @@ RUN_DEPENDS= pc-updategui:${PORTSDIR}/sysutils/pcbsd-utils-qt4 \
cups-bjnp>=0:${PORTSDIR}/print/cups-bjnp \
splix>=0:${PORTSDIR}/print/splix \
fusefs-ntfs>=0:${PORTSDIR}/sysutils/fusefs-ntfs \
- fusefs-exfat>=0:${PORTSDIR}/sysutils/fusefs-exfat \
xdg-open:${PORTSDIR}/devel/xdg-utils \
rsync:${PORTSDIR}/net/rsync \
pwcview:${PORTSDIR}/multimedia/pwcview \
View
@@ -0,0 +1,73 @@
+#!/bin/sh
+# Helper script which will create the port / distfiles
+# from a checked out git repo
+
+# Set the distfile URL we will fetch from
+DURL="http://www.pcbsd.org/~kris/software/"
+
+get_last_rev_git()
+{
+ oPWD=`pwd`
+ cd "${1}"
+ rev=0
+ rev=`git log -n 1 --date=raw | grep 'Date:' | awk '{print $2}'`
+ cd $oPWD
+ if [ $rev -ne 0 ] ; then
+ echo "$rev"
+ return 0
+ fi
+ return 1
+}
+
+if [ -z "$1" ] ; then
+ echo "Usage: ./mkports.sh <outdir>"
+ exit 1
+fi
+
+if [ ! -d "${1}" ] ; then
+ echo "Invalid directory: $1"
+ exit 1
+fi
+
+portsdir="${1}"
+distdir="${1}/distfiles"
+if [ ! -d "$portsdir" ] ; then
+ mkdir ${portsdir}
+fi
+if [ ! -d "$portsdir/sysutils" ] ; then
+ mkdir ${portsdir}/sysutils
+fi
+if [ ! -d "$distdir" ] ; then
+ mkdir ${distdir}
+fi
+
+cliREV=`get_last_rev_git "./src-sh"`
+guiREV=`get_last_rev_git "./src-qt4"`
+
+# Make the dist files
+rm ${distdir}/pcbsd-utils*.tar.bz2 2>/dev/null
+echo "Creating pcbsd-utils dist file for version: $cliREV"
+tar cvjf ${distdir}/pcbsd-utils-${cliREV}.tar.bz2 src-sh 2>/dev/null
+echo "Creating pcbsd-utils-qt4 dist file for version: $guiREV"
+tar cvjf ${distdir}/pcbsd-utils-qt4-${guiREV}.tar.bz2 src-qt4 2>/dev/null
+
+# Copy ports files
+rm -rf ${portsdir}/sysutils/pcbsd-utils 2>/dev/null
+rm -rf ${portsdir}/sysutils/pcbsd-utils-qt4 2>/dev/null
+cp -r src-sh/port-files ${portsdir}/sysutils/pcbsd-utils
+cp -r src-qt4/port-files ${portsdir}/sysutils/pcbsd-utils-qt4
+
+# Set the version numbers
+sed -i '' "s|CHGVERSION|${cliREV}|g" ${portsdir}/sysutils/pcbsd-utils/Makefile
+sed -i '' "s|CHGVERSION|${guiREV}|g" ${portsdir}/sysutils/pcbsd-utils-qt4/Makefile
+
+# Set the mirror to use
+sed -i '' "s|http://www.pcbsd.org/~kris/software/|${DURL}|g" ${portsdir}/sysutils/pcbsd-utils/Makefile
+sed -i '' "s|http://www.pcbsd.org/~kris/software/|${DURL}|g" ${portsdir}/sysutils/pcbsd-utils-qt4/Makefile
+
+# Create the makesums / distinfo file
+cd ${distdir}
+sha256 pcbsd-utils-${cliREV}.tar.bz2 > ${portsdir}/sysutils/pcbsd-utils/distinfo
+echo "SIZE (pcbsd-utils-${cliREV}.tar.bz2) = `stat -f \"%z\" pcbsd-utils-${cliREV}.tar.bz2`" >> ${portsdir}/sysutils/pcbsd-utils/distinfo
+sha256 pcbsd-utils-qt4-${guiREV}.tar.bz2 > ${portsdir}/sysutils/pcbsd-utils-qt4/distinfo
+echo "SIZE (pcbsd-utils-qt4-${guiREV}.tar.bz2) = `stat -f \"%z\" pcbsd-utils-qt4-${guiREV}.tar.bz2`" >> ${portsdir}/sysutils/pcbsd-utils-qt4/distinfo
@@ -103,7 +103,7 @@ TRANSLATIONS = i18n/EasyPBI_af.ts \
i18n/EasyPBI_zu.ts
dotrans.path=/usr/local/share/EasyPBI/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/EasyPBI/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/EasyPBI/i18n/
desktop.path=/usr/local/share/applications/
desktop.files=EasyPBI.desktop
View
@@ -100,30 +100,30 @@ TRANSLATIONS = i18n/PCDM_af.ts \
i18n/PCDM_zu.ts
dotrans.path=/usr/local/share/PCDM/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/PCDM/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/PCDM/i18n/
scripts=PCDMd
scripts.path=/usr/local/sbin
-scripts.extra=cp PCDMd /usr/local/sbin/PCDMd
+scripts.extra=cp PCDMd $(INSTALL_ROOT)/usr/local/sbin/PCDMd
xloop=PCDM-xloop
xloop.path=/usr/local/sbin
-xloop.extra=cp PCDM-xloop /usr/local/sbin/PCDM-xloop && chmod 755 /usr/local/sbin/PCDM-xloop
+xloop.extra=cp PCDM-xloop $(INSTALL_ROOT)/usr/local/sbin/PCDM-xloop && chmod 755 $(INSTALL_ROOT)/usr/local/sbin/PCDM-xloop
rcd=rc.d/pcdm
rcd.path=/usr/local/etc/rc.d
-rcd.extra=cp rc.d/pcdm /usr/local/etc/rc.d/pcdm
+rcd.extra=cp rc.d/pcdm $(INSTALL_ROOT)/usr/local/etc/rc.d/pcdm
cleanthemes.path=/usr/local/share/PCDM/themes
-cleanthemes.extra=rm -r /usr/local/share/PCDM/themes
+cleanthemes.extra=rm -r $(INSTALL_ROOT)/usr/local/share/PCDM/themes
theme=themes
theme.path=/usr/local/share/PCDM
-theme.extra=cp -r themes /usr/local/share/PCDM/.
+theme.extra=cp -r themes $(INSTALL_ROOT)/usr/local/share/PCDM/.
conf=pcdm.conf
conf.path=/usr/local/etc
-conf.extra=cp pcdm.conf /usr/local/etc/pcdm.conf.dist && chmod 600 /usr/local/etc/pcdm.conf.dist
+conf.extra=cp pcdm.conf $(INSTALL_ROOT)/usr/local/etc/pcdm.conf.dist && chmod 600 $(INSTALL_ROOT)/usr/local/etc/pcdm.conf.dist
INSTALLS += dotrans scripts rcd cleanthemes theme conf target xloop
@@ -95,7 +95,7 @@ TRANSLATIONS = i18n/AboutGui_af.ts \
i18n/AboutGui_zu.ts
dotrans.path=/usr/local/share/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/
icons.path=/usr/local/share/pcbsd/icons/
icons.files=about.png
@@ -95,7 +95,7 @@ TRANSLATIONS = i18n/libpcbsd_af.ts \
i18n/libpcbsd_zu.ts
dotrans.path=/usr/local/share/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/
include.path=/usr/local/include/
include.files=pcbsd-*.h
@@ -45,7 +45,7 @@ desktopperm.path=/usr/local/share/applications/
desktopperm.extra=chmod 644 /usr/local/share/applications/lifepreserver.desktop
dotrans.path=/usr/local/share/lifePreserver/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/lifePreserver/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/lifePreserver/i18n/
INSTALLS += target dotrans images scripts
@@ -27,7 +27,7 @@ fi
if [ ! -e ".ssh/id_rsa.pub" ]
then
echo "ERROR: Failed creating .ssh/id_rsa.pub"
- sleep 5
+ read tmp
exit 150
fi
@@ -38,8 +38,9 @@ echo $PUBKEY | ssh -p $SSHPORT $SSHUSER@$SSHHOST 'mkdir .ssh ; chmod 700 .ssh ;
echo $PUBKEY | ssh -p $SSHPORT $SSHUSER@$SSHHOST 'mkdir .ssh ; chmod 700 .ssh ; tee -a .ssh/authorized_keys2 ; chmod 644 .ssh/authorized_keys2'
-
-if [ "$?" != "0" ]
-then
-touch /tmp/.failedPreserver-${SSHUSER}
+if [ "$?" != "0" ]; then
+ touch /tmp/.failedPreserver-${SSHUSER}
fi
+
+echo "Press ENTER to continue"
+read tmp
Binary file not shown.
@@ -83,7 +83,7 @@ TRANSLATIONS = i18n/PCADSLDAP_af.ts \
i18n/PCADSLDAP_zu.ts
dotrans.path=/usr/local/share/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/
INSTALLS += target dotrans
Binary file not shown.
@@ -89,6 +89,6 @@ TRANSLATIONS = i18n/pc-bluetoothmanager_af.ts \
i18n/pc-bluetoothmanager_zu.ts
dotrans.path=/usr/local/share/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/
INSTALLS += target dotrans
Binary file not shown.
@@ -85,6 +85,6 @@ TRANSLATIONS = i18n/pc-bluetoothtray_af.ts \
i18n/pc-bluetoothtray_zu.ts
dotrans.path=/usr/local/share/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/
INSTALLS += target dotrans
@@ -84,10 +84,10 @@ TRANSLATIONS = i18n/pc-bootconfig_af.ts \
i18n/pc-bootconfig_zu.ts
dotrans.path=/usr/local/share/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/
icons = pc-bootconfig.png
icons.path=/usr/local/share/pcbsd/icons/
-icons.extra=cp pc-bootconfig.png /usr/local/share/pcbsd/icons/pc-bootconfig.png
+icons.extra=cp pc-bootconfig.png $(INSTALL_ROOT)/usr/local/share/pcbsd/icons/pc-bootconfig.png
INSTALLS += target icons dotrans
@@ -99,24 +99,24 @@ TRANSLATIONS = i18n/pc-controlpanel_af.ts \
i18n/pc-controlpanel_zu.ts
dotrans.path=/usr/local/share/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/
desktop.path=/usr/local/share/applications/
desktop.files=pccontrol.desktop
cleanitems.path=/usr/local/share/pcbsd/pc-controlpanel/items
-cleanitems.extra=rm -rf /usr/local/share/pcbsd/pc-controlpanel/items
+cleanitems.extra=rm -rf $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-controlpanel/items
mkdiritems.path=/usr/local/share/pcbsd/pc-controlpanel/items
-mkdiritems.extra=mkdir -p /usr/local/share/pcbsd/pc-controlpanel/items
+mkdiritems.extra=mkdir -p $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-controlpanel/items
cpitems.path=/usr/local/share/pcbsd/pc-controlpanel/items
-cpitems.extra=tar cvf - --exclude '.svn/' -C items . 2>/dev/null | tar xvf - -C /usr/local/share/pcbsd/pc-controlpanel/items 2>/dev/null
+cpitems.extra=tar cvf - --exclude '.svn/' -C items . 2>/dev/null | tar xvf - -C $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-controlpanel/items 2>/dev/null
mkdiricons.path=/usr/local/share/pcbsd/pc-controlpanel/icons
-mkdiricons.extra=mkdir -p /usr/local/share/pcbsd/pc-controlpanel/icons
+mkdiricons.extra=mkdir -p $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-controlpanel/icons
cpicons.path=/usr/local/share/pcbsd/pc-controlpanel/items
-cpicons.extra=tar cvf - --exclude '.svn/' -C icons . 2>/dev/null | tar xvf - -C /usr/local/share/pcbsd/pc-controlpanel/icons 2>/dev/null
+cpicons.extra=tar cvf - --exclude '.svn/' -C icons . 2>/dev/null | tar xvf - -C $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-controlpanel/icons 2>/dev/null
INSTALLS += target dotrans desktop cleanitems mkdiritems cpitems mkdiricons cpicons
@@ -83,7 +83,7 @@ TRANSLATIONS = i18n/CrashHandler_en.ts \
i18n/CrashHandler_zu.ts
dotrans.path=/usr/local/share/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/
INSTALLS += target dotrans
@@ -2,6 +2,6 @@ cupscfg.path=/usr/local/bin/
cupscfg.files=pc-cupscfg
cupsmod.path=/usr/local/bin/
-cupsmod.extra=chmod 755 /usr/local/bin/pc-cupscfg
+cupsmod.extra=chmod 755 $(INSTALL_ROOT)/usr/local/bin/pc-cupscfg
INSTALLS += cupscfg cupsmod
@@ -98,7 +98,7 @@ appicon.path=/usr/local/share/pcbsd/icons
appicon.files=pc-dmconf.png
dotrans.path=/usr/local/share/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/
INSTALLS += target dotrans appicon desktop
@@ -89,7 +89,7 @@ TRANSLATIONS = i18n/FirstBoot_af.ts \
i18n/FirstBoot_zu.ts
dotrans.path=/usr/local/share/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/
INSTALLS += target dotrans
Binary file not shown.
@@ -98,7 +98,7 @@ appicon.path=/usr/local/share/pcbsd/icons
appicon.files=pc-gdmconf.png
dotrans.path=/usr/local/share/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/
INSTALLS += target dotrans appicon desktop
Oops, something went wrong.

0 comments on commit eb70a80

Please sign in to comment.