Permalink
Browse files

Update the pcbsd-utils-qt4 stuff to work with STAGING now, in prep to

commit to FreeBSD ports tree
  • Loading branch information...
1 parent c60c604 commit 1b89eeb7d29cc1faeaa8f76ed920e1ee90c707a4 @kmoore134 kmoore134 committed Sep 26, 2013
Showing with 237 additions and 85 deletions.
  1. +93 −0 .gitignore
  2. +1 −1 src-qt4/EasyPBI/EasyPBI.pro
  3. +7 −7 src-qt4/PCDM/PCDM.pro
  4. +1 −1 src-qt4/about-gui/about-gui.pro
  5. +1 −1 src-qt4/libpcbsd/ui/ui.pro
  6. +1 −1 src-qt4/life-preserver/life-preserver.pro
  7. BIN src-qt4/pc-adsldap/pc-adsldap
  8. +1 −1 src-qt4/pc-adsldap/pc-adsldap.pro
  9. BIN src-qt4/pc-bluetoothmanager/pc-bluetoothmanager
  10. +1 −1 src-qt4/pc-bluetoothmanager/pc-bluetoothmanager.pro
  11. BIN src-qt4/pc-bluetoothtray/pc-bluetoothtray
  12. +1 −1 src-qt4/pc-bluetoothtray/pc-bluetoothtray.pro
  13. +2 −2 src-qt4/pc-bootconfig/pc-bootconfig.pro
  14. +6 −6 src-qt4/pc-controlpanel/pc-controlpanel.pro
  15. +1 −1 src-qt4/pc-crashhandler/pc-crashhandler.pro
  16. +1 −1 src-qt4/pc-cupscfg/pc-cupscfg.pro
  17. +1 −1 src-qt4/pc-dmconf/pc-dmconf.pro
  18. +1 −1 src-qt4/pc-firstbootgui/pc-firstbootgui.pro
  19. BIN src-qt4/pc-gdmconf/pc-gdmconf
  20. +1 −1 src-qt4/pc-gdmconf/pc-gdmconf.pro
  21. +2 −2 src-qt4/pc-installgui/pc-installgui.pro
  22. +1 −1 src-qt4/pc-mounttray/pc-mounttray.pro
  23. +2 −2 src-qt4/pc-netmanager/src/NetworkManager/NetworkManager.pro
  24. +1 −1 src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.pro
  25. +1 −1 src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.pro
  26. +1 −1 src-qt4/pc-netmanager/src/wificonfig/wificonfig.pro
  27. +3 −3 src-qt4/pc-pbigui/mkdirs.sh
  28. +9 −6 src-qt4/pc-pbigui/pc-pbigui.pro
  29. +2 −0 src-qt4/pc-pbigui/resources/defaults.list
  30. +1 −1 src-qt4/pc-pfmanager/pc-pfmanager.pro
  31. +1 −1 src-qt4/pc-pkgmanager/pc-pkgmanager.pro
  32. +1 −1 src-qt4/pc-servicemanager/pc-servicemanager.pro
  33. +2 −2 src-qt4/pc-softwaremanager/pc-softwaremanager.pro
  34. +1 −1 src-qt4/pc-soundconfig/pc-soundconfig.pro
  35. +1 −1 src-qt4/pc-sysmanager/pc-sysmanager.pro
  36. +1 −1 src-qt4/pc-systemupdatertray/pc-systemupdatertray.pro
  37. +1 −1 src-qt4/pc-updategui/pc-updategui.pro
  38. +1 −1 src-qt4/pc-usermanager/pc-usermanager.pro
  39. +1 −1 src-qt4/pc-welcome/pc-welcome.pro
  40. +2 −4 src-qt4/pc-xgui/pc-xgui.pro
  41. +44 −0 src-qt4/pc-xgui/resources/settings/drivers.txt
  42. +5 −2 src-qt4/port-files/Makefile
  43. +9 −18 src-qt4/port-files/pkg-plist
  44. +1 −1 src-qt4/qsudo/qsudo.pro
  45. +2 −2 src-qt4/src-qt4.pro
  46. +1 −1 src-qt4/warden-gui/warden-gui.pro
  47. +3 −1 src-qt4/xtrafiles/Makefile
  48. +11 −1 src-qt4/xtrafiles/install.sh
  49. +2 −0 src-sh/pbi-manager/man5/pbi.conf.5
  50. +4 −0 src-sh/port-files/pkg-plist
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
@@ -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
@@ -42,7 +42,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
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
@@ -97,10 +97,10 @@ TRANSLATIONS = i18n/SysInstaller_af.ts \
i18n/SysInstaller_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/
scripts.path=/usr/local/share/pcbsd/pc-installgui
-scripts.extra=cp scripts/* /usr/local/share/pcbsd/pc-installgui/ && chmod 755 /usr/local/share/pcbsd/pc-installgui/*.sh
+scripts.extra=cp scripts/* $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-installgui/ && chmod 755 $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-installgui/*.sh
INSTALLS += target dotrans scripts
@@ -95,7 +95,7 @@ TARGET = pc-mounttray
target.path = /usr/local/bin/
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
@@ -94,10 +94,10 @@ cpres.path=/usr/local/share/pcbsd/pc-netmanager/
cpres.files=resources/umts_stick
resperm.path=/usr/local/share/pcbsd/pc-netmanager/
-resperm.extra=chmod 755 /usr/local/share/pcbsd/pc-netmanager/umts_stick
+resperm.extra=chmod 755 $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-netmanager/umts_stick
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 cpres resperm
@@ -75,7 +75,7 @@ TRANSLATIONS = i18n/NetworkTray_af.ts \
i18n/NetworkTray_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 += dotrans target
@@ -78,7 +78,7 @@ TRANSLATIONS = i18n/ethernetconfig_af.ts \
i18n/ethernetconfig_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 += dotrans target
@@ -78,7 +78,7 @@ TRANSLATIONS = i18n/wificonfig_af.ts \
i18n/wificonfig_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 += dotrans target
@@ -5,8 +5,8 @@ doDirs="/usr/local/etc/xdg/menus /usr/local/etc/xdg/applications-merged /usr/loc
for i in $doDirs
do
- if [ ! -d "$i" ] ; then
- echo "Creating directory: ${i}"
- mkdir -p ${i}
+ if [ ! -d "${1}$i" ] ; then
+ echo "Creating directory: ${1}${i}"
+ mkdir -p ${1}${i}
fi
done
@@ -74,16 +74,19 @@ TRANSLATIONS = i18n/PBI_af.ts \
i18n/PBI_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/
dodirs.path=/usr/local/etc/xdg
-dodirs.extra=sh mkdirs.sh
+dodirs.extra=sh mkdirs.sh $(INSTALL_ROOT)
applnk.path=/usr/local/share/applications
-applnk.extra=cd resources && xdg-desktop-menu install pcbsd-pbi.desktop
+applnk.files=resources/pcbsd-pbi.desktop
+
+defaultlist.path=/usr/local/share/applications
+defaultlist.files=resources/defaults.list
mimexml.path=/usr/local/share/mime/packages
-mimexml.extra=cd resources && xdg-mime install pcbsd-pbi.xml
+mimexml.files=resources/pcbsd-pbi.xml
pbiimg.path=/usr/local/share/pcbsd/images/
pbiimg.extra=cd resources && xdg-icon-resource install --context mimetypes --size 64 pcbsd-pbi.png application-pbi
@@ -92,10 +95,10 @@ runpbibin.path=/usr/local/bin
runpbibin.files=resources/runpbi
runpbichmod.path=/usr/local/bin
-runpbichmod.extra=chmod 755 /usr/local/bin/runpbi
+runpbichmod.extra=chmod 755 $(INSTALL_ROOT)/usr/local/bin/runpbi
TARGET = pc-pbigui
target.path = /usr/local/bin/
-INSTALLS += target dodirs dotrans applnk pbiimg mimexml runpbibin runpbichmod
+INSTALLS += target dodirs dotrans applnk pbiimg mimexml runpbibin runpbichmod defaultlist
@@ -0,0 +1,2 @@
+[Default Applications]
+application/pbi=pcbsd-pbi.desktop
Oops, something went wrong.

0 comments on commit 1b89eeb

Please sign in to comment.