Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 3 commits
  • 92 files changed
  • 0 commit comments
  • 1 contributor
Commits on Sep 26, 2013
@kmoore134 kmoore134 Add a new "mkports.sh" helper script, which will convert the git tree…
… into

the pcbsd-utils & pcbsd-utils-qt4 ports.

While here, convert the pcbsd-utils port to use STAGING
c60c604
@kmoore134 kmoore134 Update the pcbsd-utils-qt4 stuff to work with STAGING now, in prep to
commit to FreeBSD ports tree
1b89eeb
@kmoore134 kmoore134 Merge branch 'master' of github.com:pcbsd/pcbsd 5568c61
Showing with 590 additions and 297 deletions.
  1. +93 −0 .gitignore
  2. +73 −0 mkports.sh
  3. +1 −1  src-qt4/EasyPBI/EasyPBI.pro
  4. +7 −7 src-qt4/PCDM/PCDM.pro
  5. +1 −1  src-qt4/about-gui/about-gui.pro
  6. +1 −1  src-qt4/libpcbsd/ui/ui.pro
  7. +1 −1  src-qt4/life-preserver/life-preserver.pro
  8. BIN  src-qt4/pc-adsldap/pc-adsldap
  9. +1 −1  src-qt4/pc-adsldap/pc-adsldap.pro
  10. BIN  src-qt4/pc-bluetoothmanager/pc-bluetoothmanager
  11. +1 −1  src-qt4/pc-bluetoothmanager/pc-bluetoothmanager.pro
  12. BIN  src-qt4/pc-bluetoothtray/pc-bluetoothtray
  13. +1 −1  src-qt4/pc-bluetoothtray/pc-bluetoothtray.pro
  14. +2 −2 src-qt4/pc-bootconfig/pc-bootconfig.pro
  15. +6 −6 src-qt4/pc-controlpanel/pc-controlpanel.pro
  16. +1 −1  src-qt4/pc-crashhandler/pc-crashhandler.pro
  17. +1 −1  src-qt4/pc-cupscfg/pc-cupscfg.pro
  18. +1 −1  src-qt4/pc-dmconf/pc-dmconf.pro
  19. +1 −1  src-qt4/pc-firstbootgui/pc-firstbootgui.pro
  20. BIN  src-qt4/pc-gdmconf/pc-gdmconf
  21. +1 −1  src-qt4/pc-gdmconf/pc-gdmconf.pro
  22. +2 −2 src-qt4/pc-installgui/pc-installgui.pro
  23. +1 −1  src-qt4/pc-mounttray/pc-mounttray.pro
  24. +2 −2 src-qt4/pc-netmanager/src/NetworkManager/NetworkManager.pro
  25. +1 −1  src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.pro
  26. +1 −1  src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.pro
  27. +1 −1  src-qt4/pc-netmanager/src/wificonfig/wificonfig.pro
  28. +3 −3 src-qt4/pc-pbigui/mkdirs.sh
  29. +9 −6 src-qt4/pc-pbigui/pc-pbigui.pro
  30. +2 −0  src-qt4/pc-pbigui/resources/defaults.list
  31. +1 −1  src-qt4/pc-pfmanager/pc-pfmanager.pro
  32. +1 −1  src-qt4/pc-pkgmanager/pc-pkgmanager.pro
  33. +1 −1  src-qt4/pc-servicemanager/pc-servicemanager.pro
  34. +2 −2 src-qt4/pc-softwaremanager/pc-softwaremanager.pro
  35. +1 −1  src-qt4/pc-soundconfig/pc-soundconfig.pro
  36. +1 −1  src-qt4/pc-sysmanager/pc-sysmanager.pro
  37. +1 −1  src-qt4/pc-systemupdatertray/pc-systemupdatertray.pro
  38. +1 −1  src-qt4/pc-updategui/pc-updategui.pro
  39. +1 −1  src-qt4/pc-usermanager/pc-usermanager.pro
  40. +1 −1  src-qt4/pc-welcome/pc-welcome.pro
  41. +2 −4 src-qt4/pc-xgui/pc-xgui.pro
  42. +44 −0 src-qt4/pc-xgui/resources/settings/drivers.txt
  43. +5 −2 src-qt4/port-files/Makefile
  44. +9 −18 src-qt4/port-files/pkg-plist
  45. +1 −1  src-qt4/qsudo/qsudo.pro
  46. +2 −2 src-qt4/src-qt4.pro
  47. +1 −1  src-qt4/warden-gui/warden-gui.pro
  48. +3 −1 src-qt4/xtrafiles/Makefile
  49. +11 −1 src-qt4/xtrafiles/install.sh
  50. +1 −0  src-sh/Makefile
  51. +7 −7 src-sh/about/Makefile
  52. +10 −10 src-sh/de-info/Makefile
  53. +7 −6 src-sh/libsh/Makefile
  54. +3 −1 src-sh/lpreserver/Makefile
  55. +10 −3 src-sh/lpreserver/install.sh
  56. +3 −1 src-sh/pbi-manager/Makefile
  57. +14 −16 src-sh/pbi-manager/install.sh
  58. +2 −0  src-sh/pbi-manager/man5/pbi.conf.5
  59. +5 −1 src-sh/pbi-manager/pbi-manager
  60. +2 −7 src-sh/pbi-manager/wrapper/Makefile
  61. +3 −1 src-sh/pbi-manager10/Makefile
  62. +7 −6 src-sh/pbreg/Makefile
  63. +3 −1 src-sh/pc-adctl/bin/Makefile
  64. +2 −1  src-sh/pc-adctl/conf/Makefile
  65. +2 −1  src-sh/pc-adctl/pc-krbconf/Makefile
  66. +2 −1  src-sh/pc-adctl/pc-ldapconf/Makefile
  67. +2 −1  src-sh/pc-adctl/pc-nssconf/Makefile
  68. +2 −1  src-sh/pc-adctl/pc-nssldapconf/Makefile
  69. +2 −1  src-sh/pc-adctl/pc-pamconf/Makefile
  70. +2 −1  src-sh/pc-adctl/pc-sambaconf/Makefile
  71. +2 −1  src-sh/pc-adctl/rc/Makefile
  72. +2 −1  src-sh/pc-adctl/scripts/Makefile
  73. +7 −6 src-sh/pc-checkxdisplay/Makefile
  74. +3 −1 src-sh/pc-extractoverlay/Makefile
  75. +21 −13 src-sh/pc-extractoverlay/install.sh
  76. +6 −7 src-sh/pc-fbsdupdatecheck/Makefile
  77. +8 −6 src-sh/pc-firstgui/Makefile
  78. +12 −10 src-sh/pc-metapkgmanager/Makefile
  79. +8 −6 src-sh/pc-runxgui/Makefile
  80. +8 −7 src-sh/pc-su/Makefile
  81. +2 −1  src-sh/pc-sysinstall/Makefile
  82. +4 −2 src-sh/pc-sysinstall/install.sh
  83. +12 −10 src-sh/pc-thinclient/Makefile
  84. +12 −10 src-sh/pc-updatemanager/Makefile
  85. +17 −17 src-sh/pc-xdgutil/Makefile
  86. +2 −15 src-sh/port-files/Makefile
  87. +6 −0 src-sh/port-files/pkg-install
  88. +25 −15 src-sh/port-files/pkg-plist
  89. +3 −1 src-sh/warden/Makefile
  90. +23 −14 src-sh/warden/install.sh
  91. +3 −1 src-sh/xtrafiles/Makefile
  92. +9 −1 src-sh/xtrafiles/install.sh
View
93 .gitignore
@@ -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
View
73 mkports.sh
@@ -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
View
2  src-qt4/EasyPBI/EasyPBI.pro
@@ -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
14 src-qt4/PCDM/PCDM.pro
@@ -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
View
2  src-qt4/about-gui/about-gui.pro
@@ -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
View
2  src-qt4/libpcbsd/ui/ui.pro
@@ -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
View
2  src-qt4/life-preserver/life-preserver.pro
@@ -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
View
BIN  src-qt4/pc-adsldap/pc-adsldap
Binary file not shown
View
2  src-qt4/pc-adsldap/pc-adsldap.pro
@@ -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
View
BIN  src-qt4/pc-bluetoothmanager/pc-bluetoothmanager
Binary file not shown
View
2  src-qt4/pc-bluetoothmanager/pc-bluetoothmanager.pro
@@ -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
View
BIN  src-qt4/pc-bluetoothtray/pc-bluetoothtray
Binary file not shown
View
2  src-qt4/pc-bluetoothtray/pc-bluetoothtray.pro
@@ -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
View
4 src-qt4/pc-bootconfig/pc-bootconfig.pro
@@ -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
View
12 src-qt4/pc-controlpanel/pc-controlpanel.pro
@@ -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
View
2  src-qt4/pc-crashhandler/pc-crashhandler.pro
@@ -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
View
2  src-qt4/pc-cupscfg/pc-cupscfg.pro
@@ -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
View
2  src-qt4/pc-dmconf/pc-dmconf.pro
@@ -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
View
2  src-qt4/pc-firstbootgui/pc-firstbootgui.pro
@@ -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
View
BIN  src-qt4/pc-gdmconf/pc-gdmconf
Binary file not shown
View
2  src-qt4/pc-gdmconf/pc-gdmconf.pro
@@ -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
View
4 src-qt4/pc-installgui/pc-installgui.pro
@@ -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
View
2  src-qt4/pc-mounttray/pc-mounttray.pro
@@ -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
View
4 src-qt4/pc-netmanager/src/NetworkManager/NetworkManager.pro
@@ -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
View
2  src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.pro
@@ -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
View
2  src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.pro
@@ -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
View
2  src-qt4/pc-netmanager/src/wificonfig/wificonfig.pro
@@ -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
View
6 src-qt4/pc-pbigui/mkdirs.sh
@@ -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
View
15 src-qt4/pc-pbigui/pc-pbigui.pro
@@ -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
View
2  src-qt4/pc-pbigui/resources/defaults.list
@@ -0,0 +1,2 @@
+[Default Applications]
+application/pbi=pcbsd-pbi.desktop
View
2  src-qt4/pc-pfmanager/pc-pfmanager.pro
@@ -105,7 +105,7 @@ desktop.path=/usr/local/share/applications/
desktop.files=pfmanager.desktop
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
View
2  src-qt4/pc-pkgmanager/pc-pkgmanager.pro
@@ -82,7 +82,7 @@ TRANSLATIONS = i18n/PackageManager_af.ts \
i18n/PackageManager_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/
appicon.path=/usr/local/share/pcbsd/icons
appicon.files=pkgmanager.png
View
2  src-qt4/pc-servicemanager/pc-servicemanager.pro
@@ -85,7 +85,7 @@ desktop.path=/usr/local/share/applications/
desktop.files=pc-servicemanager.desktop
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
View
4 src-qt4/pc-softwaremanager/pc-softwaremanager.pro
@@ -99,10 +99,10 @@ TRANSLATIONS = i18n/SoftwareManager_af.ts \
i18n/SoftwareManager_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/
symlnk.path=/usr/local/bin
-symlnk.extra=ln -fs /usr/local/bin/pc-softwaremanager /usr/local/bin/appcafe
+symlnk.extra=ln -fs /usr/local/bin/pc-softwaremanager $(INSTALL_ROOT)/usr/local/bin/appcafe
icons.path=/usr/local/share/pcbsd/icons
icons.files=icons/appcafe.png
View
2  src-qt4/pc-soundconfig/pc-soundconfig.pro
@@ -83,7 +83,7 @@ TRANSLATIONS = i18n/SoundConfig_af.ts \
i18n/SoundConfig_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
View
2  src-qt4/pc-sysmanager/pc-sysmanager.pro
@@ -85,7 +85,7 @@ TRANSLATIONS = i18n/PBSystem_af.ts \
i18n/PBSystem_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=pc-sysmanager.desktop
View
2  src-qt4/pc-systemupdatertray/pc-systemupdatertray.pro
@@ -80,7 +80,7 @@ TRANSLATIONS = i18n/SystemUpdaterTray_af.ts \
i18n/SystemUpdaterTray_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=pcbsdpbu.desktop
View
2  src-qt4/pc-updategui/pc-updategui.pro
@@ -82,7 +82,7 @@ TRANSLATIONS = i18n/UpdateGui_af.ts \
i18n/UpdateGui_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/
icon.path=/usr/local/share/pcbsd/icons/
icon.files=sysupdate.png
View
2  src-qt4/pc-usermanager/pc-usermanager.pro
@@ -108,7 +108,7 @@ desktop.path=/usr/local/share/applications/
desktop.files=pcusermanager.desktop
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
View
2  src-qt4/pc-welcome/pc-welcome.pro
@@ -83,7 +83,7 @@ TRANSLATIONS = i18n/PCWelcome_af.ts \
i18n/PCWelcome_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=pc-welcome.desktop
View
6 src-qt4/pc-xgui/pc-xgui.pro
@@ -104,9 +104,7 @@ temdriver.files = resources/templates/driver/*
nvdetect.path = /usr/local/share/pcbsd/xorg-gui/nvidia-detect
nvdetect.files = resources/nvidia-detect/*
dotrans.path=/usr/local/share/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
-doarch.path=/usr/local/share/pcbsd/i18n/
-doarch.extra=sh install-arch.sh `pwd`
+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/
-INSTALLS += target bin scripts conf fluxbox carddetect settings temscripts temheader temdriver nvdetect dotrans doarch
+INSTALLS += target bin scripts conf fluxbox carddetect settings temscripts temheader temdriver nvdetect dotrans
View
44 src-qt4/pc-xgui/resources/settings/drivers.txt
@@ -0,0 +1,44 @@
+apm
+ark
+ati
+ati-3d-enable
+chips
+cirrus
+cyrix
+glint
+i128
+i740
+i810
+intel
+intel-3d-enable
+imstt
+mach64
+mga
+mga-3d-enable
+neomagic
+nouveau
+nsc
+nv
+nvidia
+r128
+radeonhd
+radeonhd-3d-enable
+rendition
+openchrome
+s3
+s3virge
+savage
+siliconmotion
+sis
+sis-intel
+tdfx
+tga
+trident
+tseng
+vboxvideo
+vesa
+vga
+via
+vmware
+vmwlegacy
+voodoo
View
7 src-qt4/port-files/Makefile
@@ -35,13 +35,16 @@ USE_QT4= accessible \
WRKSRC= ${WRKDIR}/src-qt4
HAS_CONFIGURE= yes
-NO_STAGE= yes
QMAKE_PRO= src-qt4.pro
QMAKE_ARGS= -recursive ${QMAKE_PRO}
do-configure:
@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
- ${QMAKE} -unix CONFIG+="configure" ${QMAKE_PRO}
+ ${QMAKE} PREFIX=${PREFIX} -unix CONFIG+="configure" ${QMAKE_PRO}
+
+do-install:
+ cd ${WRKSRC} && make install INSTALL_ROOT=$(STAGEDIR)
+
.include <bsd.port.mk>
View
27 src-qt4/port-files/pkg-plist
@@ -2552,8 +2552,6 @@ share/PCDM/themes/default/splashscreen.png
share/PCDM/themes/default/system.png
share/PCDM/themes/default/virtualkeyboard.png
share/mime/packages/pcbsd-pbi.xml
-share/icons/hicolor/64x64/mimetypes/application-pbi.png
-share/icons/hicolor/64x64/mimetypes/gnome-mime-application-pbi.png
share/EasyPBI/EasyPBIicon.png
share/applications/about.desktop
share/applications/pccontrol.desktop
@@ -2568,7 +2566,6 @@ share/applications/pcgdmconf.desktop
share/applications/pc-welcome.desktop
share/applications/warden.desktop
share/applications/EasyPBI.desktop
-share/gnome/apps/pcbsd-pbi.desktop
lib/libpcbsd-ui.so.0.9.8
lib/libpcbsd-ui.so
lib/libpcbsd-ui.so.0
@@ -2581,14 +2578,7 @@ include/pcbsd-hardware.h
include/pcbsd-netif.h
include/pcbsd-utils.h
include/pcbsd-ui.h
-@dirrmtry etc/xdg/applications-merged
-@dirrmtry etc/xdg/menus
@dirrmtry etc/xdg/
-@dirrmtry var/db
-@dirrmtry var
-@dirrmtry share/desktop-directories
-@dirrmtry share/mime/application
-@dirrmtry share/mime
@dirrm share/warden/bin
@dirrm share/warden/images
@dirrm share/warden/i18n
@@ -2639,17 +2629,18 @@ include/pcbsd-ui.h
@dirrm share/wallpapers/FreeBSD
@dirrm share/wallpapers/PCBSD
@dirrm share/wallpapers
-@dirrmtry share/pcbsd/distfiles
-@dirrmtry share/pcbsd/xstartup
-@dirrmtry share/pcbsd/fluxboxinit
-@dirrmtry share/icons/hicolor/64x64/mimetypes
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor
-@dirrmtry share/gnome/apps
-@dirrmtry share/mime/application
@dirrmtry share/mime/packages
+@dirrmtry share/mime/application
@dirrmtry share/mime
@dirrm share/lifePreserver/i18n
@dirrm share/lifePreserver/images
@dirrm share/lifePreserver/scripts
@dirrmtry share/lifePreserver
+@dirrmtry share/warden
+@dirrmtry share/pcbsd/scripts
+@dirrmtry share/pcbsd
+@dirrmtry share/applications
+@dirrmtry share/desktop-directories
+@dirrmtry etc/xdg/menus
+@dirrmtry etc/xdg/applications-merged
+@dirrmtry etc/xdg
View
2  src-qt4/qsudo/qsudo.pro
@@ -88,6 +88,6 @@ TRANSLATIONS = i18n/qsudo_af.ts \
i18n/qsudo_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
View
4 src-qt4/src-qt4.pro
@@ -34,8 +34,8 @@ SUBDIRS+= libpcbsd \
EasyPBI \
PCDM
-doins.path=/usr/local/share/pcbsd/
-doins.extra=cd xtrafiles && sh install.sh
+doins.path=/
+doins.extra=cd xtrafiles && sh install.sh $(INSTALL_ROOT)/usr/local
INSTALLS += doins
View
2  src-qt4/warden-gui/warden-gui.pro
@@ -110,7 +110,7 @@ doicon.path=/usr/local/share/warden/images/
doicon.files=warden.png
dotrans.path=/usr/local/share/warden/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/warden/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/warden/i18n/
desktop.path=/usr/local/share/applications/
desktop.files=warden.desktop
View
4 src-qt4/xtrafiles/Makefile
@@ -2,11 +2,13 @@
# Makefile for building: pc-extractoverlay
#############################################################################
+PREFIX?= /usr/local
+
####### Install
all:
install_doinstall:
- sh install.sh
+ sh install.sh $(INSTALL_ROOT)$(PREFIX)
install: install_doinstall
View
12 src-qt4/xtrafiles/install.sh
@@ -1,7 +1,17 @@
#!/bin/sh
+DEFAULT="/usr/local"
+
+if [ -z "$1" ] ; then
+ LB="${DEFAULT}"
+else
+ LB="${1}"
+fi
+
+echo "Installing extra files to ${LB}"
+
# Copy files to system
-tar cvf - -C local . 2>/dev/null | tar xvf - -C /usr/local
+tar cvf - -C local . 2>/dev/null | tar xvf - -C ${LB} 2>/dev/null
if [ $? -ne 0 ] ; then
exit 1
fi
View
1  src-sh/Makefile
@@ -19,6 +19,7 @@ DEL_DIR = rmdir
MOVE = mv -f
CHK_DIR_EXISTS= test -d
MKDIR = mkdir -p
+PREFIX?= $(STAGEDIR)/usr/local
SUBTARGETS = \
sub-libsh \
sub-lpreserver \
View
14 src-sh/about/Makefile
@@ -4,8 +4,8 @@
####### Compiler, tools and options
+PREFIX?= /usr/local
AR = ar cqs
-QMAKE = /usr/local/bin/qmake-qt4
TAR = tar -cf
COMPRESS = gzip -9f
COPY = cp -f
@@ -31,18 +31,18 @@ clean:
check: first
install_scripts: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/
- -$(INSTALL_FILE) about $(INSTALL_ROOT)/usr/local/bin/
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/
+ -$(INSTALL_FILE) about $(INSTALL_ROOT)$(PREFIX)/bin/
uninstall_scripts: FORCE
- -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/about
- -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/
+ -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/about
+ -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/
install_dochmod: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/
- chmod 755 /usr/local/bin/about
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/
+ chmod 755 $(PREFIX)/bin/about
install: install_scripts install_dochmod FORCE
View
20 src-sh/de-info/Makefile
@@ -3,7 +3,7 @@
#############################################################################
####### Compiler, tools and options
-
+PREFIX?= /usr/local
AR = ar cqs
RANLIB =
TAR = tar -cf
@@ -30,23 +30,23 @@ all: Makefile $(TARGET)
check: first
install_scripts: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/
- -$(INSTALL_FILE) de-info $(INSTALL_ROOT)/usr/local/bin/
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/
+ -$(INSTALL_FILE) de-info $(INSTALL_ROOT)$(PREFIX)/bin/
uninstall_scripts: FORCE
- -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/de-info
- -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/
+ -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/de-info
+ -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/
install_dochmod: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/
- chmod 755 /usr/local/bin/de-info
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/
+ chmod 755 $(PREFIX)/bin/de-info
install_ddirs: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/de-profiles/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/de-profiles/
- -$(INSTALL_DIR) de-profiles $(INSTALL_ROOT)/usr/local/share/pcbsd
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/de-profiles/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/de-profiles/
+ -$(INSTALL_DIR) de-profiles $(INSTALL_ROOT)$(PREFIX)/share/pcbsd
uninstall_ddirs: FORCE
- -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/de-profiles/
+ -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/de-profiles/
install: install_scripts install_dochmod install_ddirs FORCE
View
13 src-sh/libsh/Makefile
@@ -4,6 +4,7 @@
####### Compiler, tools and options
+PREFIX?= /usr/local
AR = ar cqs
TAR = tar -cf
COMPRESS = gzip -9f
@@ -30,18 +31,18 @@ clean:
check: first
install_scripts: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/
- -$(INSTALL_FILE) functions.sh $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/scripts/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/scripts/
+ -$(INSTALL_FILE) functions.sh $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/scripts/
uninstall_scripts: FORCE
- -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/functions.sh
- -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts
+ -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/scripts/functions.sh
+ -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/scripts
install_dochmod: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/
- chmod 755 /usr/local/share/pcbsd/scripts/functions.sh
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/scripts/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/scripts/
+ chmod 755 $(PREFIX)/share/pcbsd/scripts/functions.sh
install: install_scripts install_dochmod FORCE
View
4 src-sh/lpreserver/Makefile
@@ -4,9 +4,11 @@
####### Install
+PREFIX?= /usr/local
+
all:
install_doinstall:
- sh install.sh
+ sh install.sh $(PREFIX)
install: install_doinstall
View
13 src-sh/lpreserver/install.sh
@@ -1,14 +1,21 @@
#!/bin/sh
+
+if [ -z "$1" ] ; then
+ STAGEDIR="/usr/local"
+else
+ STAGEDIR="$1"
+fi
+
# lpreserver install script
-PROGDIR="/usr/local/share/lpreserver"
+PROGDIR="${STAGEDIR}/share/lpreserver"
mkdir -p ${PROGDIR} >/dev/null 2>/dev/null
DIR=`dirname $0`
cd ${DIR}
-cp lpreserver /usr/local/bin/lpreserver
-chmod 755 /usr/local/bin/lpreserver
+cp lpreserver ${STAGEDIR}/bin/lpreserver
+chmod 755 ${STAGEDIR}/bin/lpreserver
if [ -d "${PROGDIR}/backend" ] ; then
rm -rf ${PROGDIR}/backend
View
4 src-sh/pbi-manager/Makefile
@@ -2,11 +2,13 @@
# Makefile for building: pbi-manager
#############################################################################
+PREFIX?= $(STAGEDIR)
+
####### Install
all:
install_doinstall:
- sh install.sh
+ sh install.sh $(PREFIX)
install: install_doinstall
View
30 src-sh/pbi-manager/install.sh
@@ -52,14 +52,14 @@ 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
@@ -67,7 +67,7 @@ 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,10 @@ 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`
View
2  src-sh/pbi-manager/man5/pbi.conf.5
@@ -26,6 +26,8 @@ Sets the type of proxy server we will be communicating with. Possible values: HT
Username for authentication to the specified proxy server.
.It PBI_PROXYPASS:
Password for authentication to the specified proxy server.
+.It PBI_FBSDMAJOR:
+Major release of FreeBSD to pull PBIs for, usually set to 9 or 10
.Sh SEE ALSO
.Xr pbi_add 1 ,
.Xr pbi_delete 1 ,
View
6 src-sh/pbi-manager/pbi-manager
@@ -7516,7 +7516,11 @@ getZFSTank() {
}
# Source our shared PCBSD functions
-. /usr/local/share/pcbsd/scripts/functions.sh
+if [ -z "$ALTPROGPREFIX" ] ; then
+ . ${ALTPROGPREFIX}/share/pcbsd/scripts/functions.sh
+else
+ . /usr/local/share/pcbsd/scripts/functions.sh
+fi
# Set the default umask
umask 022
View
9 src-sh/pbi-manager/wrapper/Makefile
@@ -14,7 +14,6 @@ LFLAGS = -Wl,-O1 $(DEFINES)
LIBS = $(SUBLIBS)
AR = ar cqs
RANLIB =
-QMAKE = /usr/local/bin/qmake-qt4
TAR = tar -cf
COMPRESS = gzip -9f
COPY = cp -f
@@ -40,9 +39,8 @@ OBJECTS_DIR = ./
SOURCES = main.c
OBJECTS = main.o
-MAKE_TARGET = .pbiwrapper
-DESTDIR = /usr/pbi/
-TARGET = .pbiwrapper
+MAKE_TARGET = pbiwrapper
+TARGET = pbiwrapper
first: all
####### Implicit rules
@@ -69,7 +67,6 @@ first: all
all: Makefile $(TARGET)
$(TARGET): $(OBJECTS)
- @$(CHK_DIR_EXISTS) /usr/pbi/ || $(MKDIR) /usr/pbi/
$(CC) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
Makefile:
@@ -124,8 +121,6 @@ main.o: main.c
####### Install
install_scripts: first FORCE
- -@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/pbi || $(MKDIR) $(INSTALL_ROOT)/usr/pbi/
- -$(INSTALL_FILE) .pbiwrapper $(INSTALL_ROOT)/usr/pbi/.pbiwrapper
install: FORCE install_scripts
View
4 src-sh/pbi-manager10/Makefile
@@ -2,11 +2,13 @@
# Makefile for building: pbi-manager
#############################################################################
+PREFIX?= /usr/local
+
####### Install
all:
install_doinstall:
- sh install.sh
+ sh install.sh $(PREFIX)
install: install_doinstall
View
13 src-sh/pbreg/Makefile
@@ -4,6 +4,7 @@
####### Compiler, tools and options
+PREFIX?= /usr/local
AR = ar cqs
TAR = tar -cf
COMPRESS = gzip -9f
@@ -30,18 +31,18 @@ clean:
check: first
install_scripts: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/
- -$(INSTALL_FILE) pbreg $(INSTALL_ROOT)/usr/local/bin/
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/
+ -$(INSTALL_FILE) pbreg $(INSTALL_ROOT)$(PREFIX)/bin/
uninstall_scripts: FORCE
- -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/pbreg
- -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/
+ -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/pbreg
+ -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/
install_dochmod: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/
- chmod 755 /usr/local/bin/pbreg
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/
+ chmod 755 $(PREFIX)/bin/pbreg
install: install_scripts install_dochmod FORCE
View
4 src-sh/pc-adctl/bin/Makefile
@@ -1,7 +1,9 @@
+PREFIX?= /usr/local
+
FILES=pc-adctl pc-ldapctl
FILESMODE=0555
-FILESDIR=/usr/local/bin
+FILESDIR=$(PREFIX)/bin
NO_OBJ=
.include <bsd.prog.mk>
View
3  src-sh/pc-adctl/conf/Makefile
@@ -1,7 +1,8 @@
+PREFIX?= /usr/local
FILES=pc-activedirectory.conf pc-ldap.conf
FILESMODE=0400
-FILESDIR=/usr/local/etc/
+FILESDIR=$(PREFIX)/etc/
NO_OBJ=
.include <bsd.prog.mk>
View
3  src-sh/pc-adctl/pc-krbconf/Makefile
@@ -4,11 +4,12 @@
.include <bsd.own.mk>
+PREFIX?= /usr/local
MAN=
PROGOWN= root
PROGGRP= wheel
PROGMODE= 0555
-DESTDIR= /usr/local/bin
+DESTDIR= $(PREFIX)/bin
PROG= pc-krbconf
SRCS= pc-krbconf.c pc-krbconf.h
View
3  src-sh/pc-adctl/pc-ldapconf/Makefile
@@ -4,11 +4,12 @@
.include <bsd.own.mk>
+PREFIX?= /usr/local
MAN=
PROGOWN= root
PROGGRP= wheel
PROGMODE= 0555
-DESTDIR= /usr/local/bin
+DESTDIR= $(PREFIX)/bin
PROG= pc-ldapconf
SRCS= pc-ldapconf.c pc-ldapconf.h
View
3  src-sh/pc-adctl/pc-nssconf/Makefile
@@ -4,11 +4,12 @@
.include <bsd.own.mk>
+PREFIX?= /usr/local
MAN=
PROGOWN= root
PROGGRP= wheel
PROGMODE= 0555
-DESTDIR= /usr/local/bin
+DESTDIR= $(PREFIX)/bin
PROG= pc-nssconf
SRCS= pc-nssconf.c pc-nssconf.h
View
3  src-sh/pc-adctl/pc-nssldapconf/Makefile
@@ -4,11 +4,12 @@
.include <bsd.own.mk>
+PREFIX?= /usr/local
MAN=
PROGOWN= root
PROGGRP= wheel
PROGMODE= 0555
-DESTDIR= /usr/local/bin
+DESTDIR= $(PREFIX)/bin
PROG= pc-nssldapconf
SRCS= pc-nssldapconf.c pc-nssldapconf.h
View
3  src-sh/pc-adctl/pc-pamconf/Makefile
@@ -4,11 +4,12 @@
.include <bsd.own.mk>
+PREFIX?= /usr/local
MAN=
PROGOWN= root
PROGGRP= wheel
PROGMODE= 0555
-DESTDIR= /usr/local/bin
+DESTDIR= $(PREFIX)/bin
PROG= pc-pamconf
SRCS= pc-pamconf.c pc-pamconf.h
View
3  src-sh/pc-adctl/pc-sambaconf/Makefile
@@ -4,11 +4,12 @@
.include <bsd.own.mk>
+PREFIX?= /usr/local
MAN=
PROGOWN= root
PROGGRP= wheel
PROGMODE= 0555
-DESTDIR= /usr/local/bin
+DESTDIR= $(PREFIX)/bin
PROG= pc-sambaconf
SRCS= pc-sambaconf.c pc-sambaconf.h
View
3  src-sh/pc-adctl/rc/Makefile
@@ -1,7 +1,8 @@
+PREFIX?= /usr/local
FILES=rc.activedirectory rc.ldap
FILESMODE=0444
-FILESDIR=/usr/local/etc/
+FILESDIR=$(PREFIX)/etc/
NO_OBJ=
.include <bsd.prog.mk>
View
3  src-sh/pc-adctl/scripts/Makefile
@@ -1,8 +1,9 @@
+PREFIX?= /usr/local
FILES=pc-activedirectory pc-kerberos pc-kinit pc-nsswitch pc-pam \
pc-samba pc-ldap pc-nssldap pc-directory
FILESMODE=0555
-FILESDIR=/usr/local/etc/rc.d
+FILESDIR=$(PREFIX)/etc/rc.d
NO_OBJ=
.include <bsd.prog.mk>
View
13 src-sh/pc-checkxdisplay/Makefile
@@ -2,6 +2,7 @@
# Makefile for building: pc-checkxdisplay
#############################################################################
+PREFIX?= /usr/local
FILE = pc-checkxdisplay
AR = ar cqs
RANLIB =
@@ -27,18 +28,18 @@ first: all
all:
install_scripts: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/
- -$(INSTALL_FILE) $(FILE) $(INSTALL_ROOT)/usr/local/bin/
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/
+ -$(INSTALL_FILE) $(FILE) $(INSTALL_ROOT)$(PREFIX)/bin/
uninstall_scripts: FORCE
- -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/$(FILE)
- -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/
+ -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/$(FILE)
+ -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/
install_dochmod: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/
- chmod 755 /usr/local/bin/$(FILE)
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/
+ chmod 755 $(PREFIX)/bin/$(FILE)
install: install_scripts install_dochmod FORCE
View
4 src-sh/pc-extractoverlay/Makefile
@@ -2,11 +2,13 @@
# Makefile for building: pc-extractoverlay
#############################################################################
+PREFIX?= /usr/local
+
####### Install
all:
install_doinstall:
- sh install.sh
+ sh install.sh $(PREFIX)
install: install_doinstall
View
34 src-sh/pc-extractoverlay/install.sh
@@ -1,55 +1,63 @@
#!/bin/sh
-cp pc-extractoverlay /usr/local/bin/pc-extractoverlay
+DEFAULT="/usr/local"
+
+if [ -z "$1" ] ; then
+ LB="${DEFAULT}"
+else
+ LB="${1}"
+fi
+
+cp pc-extractoverlay ${LB}/bin/pc-extractoverlay
if [ $? -ne 0 ] ; then
exit 1
fi
-chmod 755 /usr/local/bin/pc-extractoverlay
+chmod 755 ${LB}/bin/pc-extractoverlay
if [ $? -ne 0 ] ; then
exit 1
fi
-if [ ! -d "/usr/local/share/pcbsd/conf" ] ; then
- mkdir -p /usr/local/share/pcbsd/conf
+if [ ! -d "${LB}/share/pcbsd/conf" ] ; then
+ mkdir -p ${LB}/share/pcbsd/conf
fi
-if [ ! -d "/usr/local/share/pcbsd/distfiles" ] ; then
- mkdir -p /usr/local/share/pcbsd/distfiles
+if [ ! -d "${LB}/share/pcbsd/distfiles" ] ; then
+ mkdir -p ${LB}/share/pcbsd/distfiles
fi
# Copy port prune list
-cp prune-port-files /usr/local/share/pcbsd/conf
+cp prune-port-files ${LB}/share/pcbsd/conf
if [ $? -ne 0 ] ; then
exit 1
fi
# Copy exclude list
-cp port-excludes /usr/local/share/pcbsd/conf
+cp port-excludes ${LB}/share/pcbsd/conf
if [ $? -ne 0 ] ; then
exit 1
fi
-cp desktop-excludes /usr/local/share/pcbsd/conf
+cp desktop-excludes ${LB}/share/pcbsd/conf
if [ $? -ne 0 ] ; then
exit 1
fi
-cp server-excludes /usr/local/share/pcbsd/conf
+cp server-excludes ${LB}/share/pcbsd/conf
if [ $? -ne 0 ] ; then
exit 1
fi
# Now create overlay.txz file
-tar cvJf /usr/local/share/pcbsd/distfiles/port-overlay.txz -C ports-overlay .
+tar cvJ --uname "root" --gname "wheel" -f ${LB}/share/pcbsd/distfiles/port-overlay.txz -C ports-overlay .
if [ $? -ne 0 ] ; then
exit 1
fi
# Now create desktop-overlay.txz file
-tar cvJf /usr/local/share/pcbsd/distfiles/desktop-overlay.txz -C desktop-overlay .
+tar cvJ --uname "root" --gname "wheel" -f ${LB}/share/pcbsd/distfiles/desktop-overlay.txz -C desktop-overlay .
if [ $? -ne 0 ] ; then
exit 1
fi
# Now create server-overlay.txz file
-tar cvJf /usr/local/share/pcbsd/distfiles/server-overlay.txz -C server-overlay .
+tar cvJ --uname "root" --gname "wheel" -f ${LB}/share/pcbsd/distfiles/server-overlay.txz -C server-overlay .
if [ $? -ne 0 ] ; then
exit 1
fi
View
13 src-sh/pc-fbsdupdatecheck/Makefile
@@ -1,6 +1,7 @@
#############################################################################
-# Makefile for building: /usr/local/bin/pc-fbsdupdatecheck
+# Makefile for building: $(PREFIX)/bin/pc-fbsdupdatecheck
#############################################################################
+PREFIX?= /usr/local
####### Compiler, tools and options
@@ -9,13 +10,11 @@ CXX = g++
DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
CFLAGS = -pipe -O2 -Wall -W $(DEFINES)
CXXFLAGS = -pipe -O2 -Wall -W $(DEFINES)
-INCPATH = -I/usr/local/include -I. -I/usr/local/include
LINK = g++
LFLAGS = -Wl,-O1 -pthread
LIBS = $(SUBLIBS)
AR = ar cqs
RANLIB =
-QMAKE = /usr/local/bin/qmake-qt4
TAR = tar -cf
COMPRESS = gzip -9f
COPY = cp -f
@@ -42,7 +41,7 @@ OBJECTS_DIR = ./
SOURCES = main.c
OBJECTS = main.o
MAKE_TARGET = pc-fbsdupdatecheck
-DESTDIR = /usr/local/bin/
+DESTDIR = $(PREFIX)/bin/
TARGET = pc-fbsdupdatecheck
first: all
@@ -70,7 +69,7 @@ first: all
all: Makefile $(TARGET)
$(TARGET): $(OBJECTS)
- @$(CHK_DIR_EXISTS) /usr/local/bin/ || $(MKDIR) /usr/local/bin/
+ @$(CHK_DIR_EXISTS) $(PREFIX)/bin/ || $(MKDIR) $(PREFIX)/bin/
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
Makefile:
@@ -125,8 +124,8 @@ main.o: main.c
####### Install
install_scripts: first FORCE
- -@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/
- -$(INSTALL_FILE) pc-fbsdupdatecheck $(INSTALL_ROOT)/usr/local/bin/
+ -@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/
+ -$(INSTALL_FILE) pc-fbsdupdatecheck $(INSTALL_ROOT)$(PREFIX)/bin/
install: FORCE install_scripts
View
14 src-sh/pc-firstgui/Makefile
@@ -4,6 +4,8 @@
####### Compiler, tools and options
+PREFIX?= /usr/local
+
AR = ar cqs
TAR = tar -cf
COMPRESS = gzip -9f
@@ -30,18 +32,18 @@ clean:
check: first
install_scripts: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/
- -$(INSTALL_FILE) pc-firstgui $(INSTALL_ROOT)/usr/local/bin/
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/
+ -$(INSTALL_FILE) pc-firstgui $(INSTALL_ROOT)$(PREFIX)/bin/
uninstall_scripts: FORCE
- -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/pc-firstgui
- -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/
+ -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/pc-firstgui
+ -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/
install_dochmod: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/
- chmod 755 /usr/local/bin/pc-firstgui
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/
+ chmod 755 $(PREFIX)/bin/pc-firstgui
install: install_scripts install_dochmod FORCE
View
22 src-sh/pc-metapkgmanager/Makefile
@@ -4,6 +4,8 @@
####### Compiler, tools and options
+PREFIX?= /usr/local
+
AR = ar cqs
RANLIB =
TAR = tar -cf
@@ -30,20 +32,20 @@ all: Makefile $(TARGET)
check: first
install_scripts: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/
- -$(INSTALL_FILE) pc-metapkgmanager $(INSTALL_ROOT)/usr/local/bin/
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/metaset/ || rm -rf /usr/local/share/pcbsd/metaset
- cp -r metaset /usr/local/share/pcbsd/metaset
- cd /usr/local/bin/ && ln -f pc-metapkgmanager pc-pkg
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/
+ -$(INSTALL_FILE) pc-metapkgmanager $(INSTALL_ROOT)$(PREFIX)/bin/
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/metaset/ || rm -rf $(PREFIX)/share/pcbsd/metaset
+ cp -r metaset $(PREFIX)/share/pcbsd/metaset
+ cd $(PREFIX)/bin/ && ln -f pc-metapkgmanager pc-pkg
uninstall_scripts: FORCE
- -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/pc-metapkgmanager
- -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/
+ -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/pc-metapkgmanager
+ -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/
install_dochmod: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/
- chmod 755 /usr/local/bin/pc-metapkgmanager
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/
+ chmod 755 $(PREFIX)/bin/pc-metapkgmanager
install: install_scripts install_dochmod FORCE
View
14 src-sh/pc-runxgui/Makefile
@@ -2,6 +2,8 @@
# Makefile for building: pc-runxgui
#############################################################################
+PREFIX?= /usr/local
+
AR = ar cqs
RANLIB =
TAR = tar -cf
@@ -26,18 +28,18 @@ first: all
all:
install_scripts: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/
- -$(INSTALL_FILE) pc-runxgui $(INSTALL_ROOT)/usr/local/bin/
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/
+ -$(INSTALL_FILE) pc-runxgui $(INSTALL_ROOT)$(PREFIX)/bin/
uninstall_scripts: FORCE
- -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/pc-runxgui
- -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/
+ -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/pc-runxgui
+ -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/
install_dochmod: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/
- chmod 755 /usr/local/bin/pc-runxgui
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/
+ chmod 755 $(PREFIX)/bin/pc-runxgui
install: install_scripts install_dochmod FORCE
View
15 src-sh/pc-su/Makefile
@@ -4,8 +4,9 @@
####### Compiler, tools and options
+PREFIX?= /usr/local
+
AR = ar cqs
-QMAKE = /usr/local/bin/qmake-qt4
TAR = tar -cf
COMPRESS = gzip -9f
COPY = cp -f
@@ -31,18 +32,18 @@ clean:
check: first
install_scripts: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/
- -$(INSTALL_FILE) pc-su $(INSTALL_ROOT)/usr/local/bin/
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/
+ -$(INSTALL_FILE) pc-su $(INSTALL_ROOT)$(PREFIX)/bin/
uninstall_scripts: FORCE
- -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/pc-su
- -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/
+ -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/pc-su
+ -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/
install_dochmod: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/
- chmod 755 /usr/local/bin/pc-su
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/
+ chmod 755 $(PREFIX)/bin/pc-su
install: install_scripts install_dochmod FORCE
View
3  src-sh/pc-sysinstall/Makefile