Changeset 5568c61


Ignore:
Timestamp:
Sep 26, 2013 2:03:49 PM (7 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
3388c59
Parents:
1b89eeb (diff), 565dbe4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

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

Files:
3 added
3 deleted
89 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/life-preserver/LPTray.cpp

    r108626c r8c6a630  
    7070    if(info[0] == "STARTED"){ 
    7171      this->showMessage( info[1], info[2], QSystemTrayIcon::Information, 5000); 
    72     }else if(info[0] == "RUNNING"){ 
    73       //don't show anything here - just let the tooltip update 
    7472    }else if(info[0] == "FINISHED"){ 
    7573      this->showMessage( info[1], info[2], QSystemTrayIcon::Information, 5000); 
    7674    }else if(info[0] == "ERROR"){ 
    77       this->showMessage( info[1], info[2], QSystemTrayIcon::Warning, 5000); 
     75      this->showMessage( info[1], info[2], QSystemTrayIcon::Warning, 10000); 
    7876    } 
    7977     
  • src-qt4/life-preserver/LPWatcher.cpp

    r108626c r565dbe4  
    8686  unsigned int base; 
    8787  if(type=="message"){base=10;} 
    88   else if(type=="replicate"){base=20;} 
     88  else if(type=="replication"){base=20;} 
    8989  else if(type=="critical"){base=30;} 
    9090  else if(type=="mirror"){base=40;} 
     
    158158      //Setup the file watcher for this new log file 
    159159      FILE_REPLICATION = dev; 
     160      dev = message.section(" ",5,5,QString::SectionSkipEmpty); 
    160161      startRepFileWatcher(); 
    161162      //Set the appropriate status variables 
    162       LOGS.insert(20,"REPSTARTED"); 
    163       // 21 - dataset set on update ping 
    164       LOGS.insert(22, tr("Replication Started") ); //summary 
    165       // 23 - Full message set on update ping 
     163      LOGS.insert(20,"STARTED"); 
     164      LOGS.insert(21, dev); //zpool 
     165      LOGS.insert(22, tr("Replication Starting") ); //summary 
     166      LOGS.insert(23, QString(tr("Starting replication for %1")).arg(dev) ); //Full message 
    166167      LOGS.insert(24, timestamp); //full timestamp 
    167168      LOGS.insert(25, time); // time only 
     
    171172      dev = message.section(" ",-1).simplified(); 
    172173      //Now set the status of the process 
    173       LOGS.insert(20,"REPFINISHED"); 
     174      LOGS.insert(20,"FINISHED"); 
    174175      LOGS.insert(21,dev); //dataset 
    175176      LOGS.insert(22, tr("Finished Replication") ); //summary 
     
    178179      LOGS.insert(25, time); // time only       
    179180      if(!quiet){ emit MessageAvailable("replication"); } 
    180     }else if( message.contains("FAILED replication") ){ 
     181    }else if( message.contains("failed replication") ){ 
    181182      stopRepFileWatcher(); 
    182183      //Now set the status of the process 
     
    184185      QString file = log.section("LOGFILE:",1,1).simplified(); 
    185186      QString tt = QString(tr("Replication Failed for %1")).arg(dev) +"\n"+ QString(tr("Logfile available at: %1")).arg(file); 
    186       LOGS.insert(20,"REPERROR"); 
     187      LOGS.insert(20,"ERROR"); 
    187188      LOGS.insert(21,dev); //dataset 
    188189      LOGS.insert(22, tr("Replication Failed") ); //summary 
     
    196197} 
    197198 
    198 void LPWatcher::readReplicationFile(bool quiet){ 
     199void LPWatcher::readReplicationFile(){ 
    199200  QString stat; 
    200201  while( !RFSTREAM->atEnd() ){  
     
    203204    else if(line.startsWith("send from ")){} 
    204205    else if(line.startsWith("TIME ")){} 
     206    else if(line.startsWith("warning: ")){} //start of an error 
    205207    else{ stat = line; } //only save the relevant/latest status line 
    206208  } 
    207   if(stat.isEmpty()){ 
    208     qDebug() << "New Status Message:" << stat; 
     209  if(!stat.isEmpty()){ 
     210    //qDebug() << "New Status Message:" << stat;             
    209211    //Divide up the status message into sections 
    210212    stat.replace("\t"," "); 
     
    233235      LOGS.insert(20,"RUNNING"); 
    234236      LOGS.insert(21,dataset); 
     237      LOGS.insert(22,txt); 
    235238      LOGS.insert(23,txt); 
    236       if(!quiet){ emit MessageAvailable("replication"); } 
     239      emit MessageAvailable(""); 
    237240    } 
    238241  } 
     
    240243 
    241244void LPWatcher::startRepFileWatcher(){ 
     245  //qDebug() << "Start Rep File Watcher:" << FILE_REPLICATION; 
    242246  if(FILE_REPLICATION.isEmpty()){ return; } 
     247 
     248  if(watcher->files().contains(FILE_REPLICATION)){ return; } //duplicate - file already opened 
     249  /*else if(!watcher->files().isEmpty()){  
     250    //Check that the file watcher is not already operating on a file 
     251    // only one can be running at a time, so always cancel the previous instance (it is stale) 
     252    // *** WARNING - This causes seg fault for some reason**** 
     253    QString tmp = FILE_REPLICATION; 
     254    stopRepFileWatcher(); 
     255    FILE_REPLICATION = tmp; 
     256  }*/ 
     257  //Check to make sure that lpreserver actually has a process running before starting this 
     258  //if(!QFile::exists("/var/run/<something.pid>"){ FILE_REPLICATION.clear(); return; } 
     259  //Check for the existance of the file to watch and create it as necessary   
    243260  if(!QFile::exists(FILE_REPLICATION)){ system( QString("touch "+FILE_REPLICATION).toUtf8() ); } 
     261  //Now open the file and start watching it for changes 
    244262  repfile->setFileName(FILE_REPLICATION); 
    245263  repfile->open(QIODevice::ReadOnly | QIODevice::Text); 
    246264  RFSTREAM = new QTextStream(repfile); 
    247265  watcher->addPath(FILE_REPLICATION); 
     266  //qDebug() << "Finished starting rep file watcher"; 
    248267} 
    249268 
    250269void LPWatcher::stopRepFileWatcher(){ 
     270  //qDebug() << "Stop Rep File Watcher:" << FILE_REPLICATION; 
    251271  if(FILE_REPLICATION.isEmpty()){ return; } 
    252272  watcher->removePath(FILE_REPLICATION); 
     273  //Close down the stream 
     274  RFSTREAM->setStatus(QTextStream::ReadPastEnd); //let any running process know to stop now 
     275  delete RFSTREAM;   
     276  //Close the file 
    253277  repfile->close(); 
    254   delete RFSTREAM; 
     278  //clear internal variables 
    255279  FILE_REPLICATION.clear(); 
    256280  repTotK.clear(); 
    257281  lastSize.clear(); 
     282  //qDebug() << "Finished stopping rep file watcher"; 
    258283} 
    259284 
  • src-qt4/life-preserver/LPWatcher.h

    r220bbd4 r8c6a630  
    4444 
    4545        void readLogFile(bool quiet = false); 
    46         void readReplicationFile(bool quiet = false); 
     46        void readReplicationFile(); //always sends quiet signals 
    4747 
    4848        void startRepFileWatcher(); 
  • .gitignore

    rb246b06 r1b89eeb  
    902902src-qt4/pc-mounttray/pc-mounttray 
    903903src-qt4/life-preserver/life-preserver 
     904src-qt4/about-gui/about-gui 
     905 
     906src-qt4/about-gui/ui_mainwindow.h 
     907src-qt4/pc-adsldap/ui_adsldap.h 
     908src-qt4/pc-bluetoothmanager/ui_btmaingui.h 
     909src-qt4/pc-bootconfig/Makefile 
     910src-qt4/pc-bootconfig/pc-bootconfig 
     911src-qt4/pc-bootconfig/ui_mainUI.h 
     912src-qt4/pc-bugreport/ui_maillist.h 
     913src-qt4/pc-bugreport/ui_mainwindow.h 
     914src-qt4/pc-bugreport/ui_showinfodialog.h 
     915src-qt4/pc-bugreport/ui_toolbox.h 
     916src-qt4/pc-bugreport/ui_weburl.h 
     917src-qt4/pc-controlpanel/pc-controlpanel 
     918src-qt4/pc-crashhandler/pbi-crashhandler-gui 
     919src-qt4/pc-crashhandler/ui_crashhandler.h 
     920src-qt4/pc-crashhandler/ui_details.h 
     921src-qt4/pc-gdmconf/ui_mainwindow.h 
     922src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_af.qm 
     923src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_ar.qm 
     924src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_az.qm 
     925src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_bg.qm 
     926src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_bn.qm 
     927src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_bs.qm 
     928src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_ca.qm 
     929src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_cs.qm 
     930src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_cy.qm 
     931src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_da.qm 
     932src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_de.qm 
     933src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_el.qm 
     934src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_en_GB.qm 
     935src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_en_ZA.qm 
     936src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_es.qm 
     937src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_et.qm 
     938src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_eu.qm 
     939src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_fa.qm 
     940src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_fi.qm 
     941src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_fr.qm 
     942src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_fr_CA.qm 
     943src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_fur.qm 
     944src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_gl.qm 
     945src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_he.qm 
     946src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_hi.qm 
     947src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_hr.qm 
     948src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_hu.qm 
     949src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_id.qm 
     950src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_is.qm 
     951src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_it.qm 
     952src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_ja.qm 
     953src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_ka.qm 
     954src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_ko.qm 
     955src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_lt.qm 
     956src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_lv.qm 
     957src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_mk.qm 
     958src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_mn.qm 
     959src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_ms.qm 
     960src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_mt.qm 
     961src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_nb.qm 
     962src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_ne.qm 
     963src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_nl.qm 
     964src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_pa.qm 
     965src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_pl.qm 
     966src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_pt.qm 
     967src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_pt_BR.qm 
     968src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_ro.qm 
     969src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_ru.qm 
     970src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_sa.qm 
     971src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_sk.qm 
     972src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_sl.qm 
     973src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_sr.qm 
     974src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_sv.qm 
     975src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_sw.qm 
     976src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_ta.qm 
     977src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_tg.qm 
     978src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_th.qm 
     979src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_tr.qm 
     980src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_uk.qm 
     981src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_uz.qm 
     982src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_vi.qm 
     983src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_zh_CN.qm 
     984src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_zh_HK.qm 
     985src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_zh_TW.qm 
     986src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_zu.qm 
     987src-qt4/pc-netmanager/src/ethernetconfig/ui_ethernetconfig.h 
     988src-qt4/pc-netmanager/src/wificonfig/pc-wificonfig 
     989src-qt4/pc-netmanager/src/wificonfig/ui_dialogwpapersonal.h 
     990src-qt4/pc-netmanager/src/wificonfig/ui_wepconfig.h 
     991src-qt4/pc-netmanager/src/wificonfig/ui_wificonfigwidgetbase.h 
     992src-qt4/pc-netmanager/src/wificonfig/ui_wifiscanssid.h 
     993src-qt4/pc-netmanager/src/wificonfig/ui_wifiselectiondialog.h 
     994src-sh/pbi-manager/wrapper/.pbiwrapper 
     995src-sh/pbi-manager/wrapper/pbiwrapper 
     996src-sh/pbi-manager10/wrapper/.pbiwrapper 
  • src-qt4/EasyPBI/EasyPBI.pro

    r24ef714 r1b89eeb  
    104104 
    105105dotrans.path=/usr/local/share/EasyPBI/i18n/ 
    106 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/EasyPBI/i18n/ 
     106dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/EasyPBI/i18n/ 
    107107 
    108108desktop.path=/usr/local/share/applications/ 
  • src-qt4/PCDM/PCDM.pro

    r5b07f4a r1b89eeb  
    101101 
    102102dotrans.path=/usr/local/share/PCDM/i18n/ 
    103 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/PCDM/i18n/ 
     103dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/PCDM/i18n/ 
    104104 
    105105scripts=PCDMd 
    106106scripts.path=/usr/local/sbin 
    107 scripts.extra=cp PCDMd /usr/local/sbin/PCDMd 
     107scripts.extra=cp PCDMd $(INSTALL_ROOT)/usr/local/sbin/PCDMd 
    108108 
    109109xloop=PCDM-xloop 
    110110xloop.path=/usr/local/sbin 
    111 xloop.extra=cp PCDM-xloop /usr/local/sbin/PCDM-xloop && chmod 755 /usr/local/sbin/PCDM-xloop 
     111xloop.extra=cp PCDM-xloop $(INSTALL_ROOT)/usr/local/sbin/PCDM-xloop && chmod 755 $(INSTALL_ROOT)/usr/local/sbin/PCDM-xloop 
    112112 
    113113rcd=rc.d/pcdm 
    114114rcd.path=/usr/local/etc/rc.d 
    115 rcd.extra=cp rc.d/pcdm /usr/local/etc/rc.d/pcdm 
     115rcd.extra=cp rc.d/pcdm $(INSTALL_ROOT)/usr/local/etc/rc.d/pcdm 
    116116 
    117117cleanthemes.path=/usr/local/share/PCDM/themes 
    118 cleanthemes.extra=rm -r /usr/local/share/PCDM/themes 
     118cleanthemes.extra=rm -r $(INSTALL_ROOT)/usr/local/share/PCDM/themes 
    119119 
    120120theme=themes 
    121121theme.path=/usr/local/share/PCDM 
    122 theme.extra=cp -r themes /usr/local/share/PCDM/. 
     122theme.extra=cp -r themes $(INSTALL_ROOT)/usr/local/share/PCDM/. 
    123123 
    124124conf=pcdm.conf 
    125125conf.path=/usr/local/etc 
    126 conf.extra=cp pcdm.conf /usr/local/etc/pcdm.conf.dist && chmod 600 /usr/local/etc/pcdm.conf.dist 
     126conf.extra=cp pcdm.conf $(INSTALL_ROOT)/usr/local/etc/pcdm.conf.dist && chmod 600 $(INSTALL_ROOT)/usr/local/etc/pcdm.conf.dist 
    127127 
    128128INSTALLS += dotrans scripts rcd cleanthemes theme conf target xloop 
  • src-qt4/about-gui/about-gui.pro

    r24ef714 r1b89eeb  
    9696 
    9797dotrans.path=/usr/local/share/pcbsd/i18n/ 
    98 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     98dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    9999 
    100100icons.path=/usr/local/share/pcbsd/icons/ 
  • src-qt4/libpcbsd/ui/ui.pro

    r24ef714 r1b89eeb  
    9696 
    9797dotrans.path=/usr/local/share/pcbsd/i18n/ 
    98 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     98dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    9999 
    100100include.path=/usr/local/include/ 
  • src-qt4/life-preserver/life-preserver.pro

    r559e01f r1b89eeb  
    4343 
    4444dotrans.path=/usr/local/share/lifePreserver/i18n/ 
    45 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/lifePreserver/i18n/ 
     45dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/lifePreserver/i18n/ 
    4646 
    4747INSTALLS += target dotrans images scripts 
  • src-qt4/pc-adsldap/pc-adsldap.pro

    r24ef714 r1b89eeb  
    8484 
    8585dotrans.path=/usr/local/share/pcbsd/i18n/ 
    86 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     86dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    8787 
    8888INSTALLS += target dotrans 
  • src-qt4/pc-bluetoothmanager/pc-bluetoothmanager.pro

    r24ef714 r1b89eeb  
    9090 
    9191dotrans.path=/usr/local/share/pcbsd/i18n/ 
    92 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     92dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    9393 
    9494INSTALLS += target dotrans 
  • src-qt4/pc-bluetoothtray/pc-bluetoothtray.pro

    r24ef714 r1b89eeb  
    8686 
    8787dotrans.path=/usr/local/share/pcbsd/i18n/ 
    88 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     88dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    8989 
    9090INSTALLS += target dotrans 
  • src-qt4/pc-bootconfig/pc-bootconfig.pro

    rbd1a1d2 r1b89eeb  
    8585 
    8686dotrans.path=/usr/local/share/pcbsd/i18n/ 
    87 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     87dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    8888 
    8989icons = pc-bootconfig.png 
    9090icons.path=/usr/local/share/pcbsd/icons/ 
    91 icons.extra=cp pc-bootconfig.png /usr/local/share/pcbsd/icons/pc-bootconfig.png 
     91icons.extra=cp pc-bootconfig.png $(INSTALL_ROOT)/usr/local/share/pcbsd/icons/pc-bootconfig.png 
    9292 
    9393INSTALLS += target icons dotrans 
  • src-qt4/pc-controlpanel/pc-controlpanel.pro

    r24ef714 r1b89eeb  
    100100 
    101101dotrans.path=/usr/local/share/pcbsd/i18n/ 
    102 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     102dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    103103 
    104104desktop.path=/usr/local/share/applications/ 
     
    106106 
    107107cleanitems.path=/usr/local/share/pcbsd/pc-controlpanel/items 
    108 cleanitems.extra=rm -rf /usr/local/share/pcbsd/pc-controlpanel/items 
     108cleanitems.extra=rm -rf $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-controlpanel/items 
    109109 
    110110mkdiritems.path=/usr/local/share/pcbsd/pc-controlpanel/items 
    111 mkdiritems.extra=mkdir -p /usr/local/share/pcbsd/pc-controlpanel/items 
     111mkdiritems.extra=mkdir -p $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-controlpanel/items 
    112112 
    113113cpitems.path=/usr/local/share/pcbsd/pc-controlpanel/items 
    114 cpitems.extra=tar cvf - --exclude '.svn/' -C items . 2>/dev/null | tar xvf - -C /usr/local/share/pcbsd/pc-controlpanel/items 2>/dev/null 
     114cpitems.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 
    115115 
    116116mkdiricons.path=/usr/local/share/pcbsd/pc-controlpanel/icons 
    117 mkdiricons.extra=mkdir -p /usr/local/share/pcbsd/pc-controlpanel/icons 
     117mkdiricons.extra=mkdir -p $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-controlpanel/icons 
    118118 
    119119cpicons.path=/usr/local/share/pcbsd/pc-controlpanel/items 
    120 cpicons.extra=tar cvf - --exclude '.svn/' -C icons . 2>/dev/null | tar xvf - -C /usr/local/share/pcbsd/pc-controlpanel/icons 2>/dev/null 
     120cpicons.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 
    121121 
    122122INSTALLS += target dotrans desktop cleanitems mkdiritems cpitems mkdiricons cpicons 
  • src-qt4/pc-crashhandler/pc-crashhandler.pro

    r24ef714 r1b89eeb  
    8484 
    8585dotrans.path=/usr/local/share/pcbsd/i18n/ 
    86 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     86dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    8787 
    8888INSTALLS += target dotrans 
  • src-qt4/pc-cupscfg/pc-cupscfg.pro

    r1620346 r1b89eeb  
    33 
    44cupsmod.path=/usr/local/bin/ 
    5 cupsmod.extra=chmod 755 /usr/local/bin/pc-cupscfg 
     5cupsmod.extra=chmod 755 $(INSTALL_ROOT)/usr/local/bin/pc-cupscfg 
    66 
    77INSTALLS += cupscfg cupsmod 
  • src-qt4/pc-dmconf/pc-dmconf.pro

    rfb7fe1b r1b89eeb  
    9999 
    100100dotrans.path=/usr/local/share/pcbsd/i18n/ 
    101 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     101dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    102102 
    103103 
  • src-qt4/pc-firstbootgui/pc-firstbootgui.pro

    r24ef714 r1b89eeb  
    9090 
    9191dotrans.path=/usr/local/share/pcbsd/i18n/ 
    92 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     92dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    9393 
    9494INSTALLS += target dotrans 
  • src-qt4/pc-gdmconf/pc-gdmconf.pro

    re49ab68 r1b89eeb  
    9999 
    100100dotrans.path=/usr/local/share/pcbsd/i18n/ 
    101 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     101dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    102102 
    103103 
  • src-qt4/pc-installgui/pc-installgui.pro

    r93572be r1b89eeb  
    9898 
    9999dotrans.path=/usr/local/share/pcbsd/i18n/ 
    100 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     100dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    101101 
    102102scripts.path=/usr/local/share/pcbsd/pc-installgui 
    103 scripts.extra=cp scripts/* /usr/local/share/pcbsd/pc-installgui/ && chmod 755 /usr/local/share/pcbsd/pc-installgui/*.sh 
     103scripts.extra=cp scripts/* $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-installgui/ && chmod 755 $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-installgui/*.sh 
    104104 
    105105INSTALLS += target dotrans scripts 
  • src-qt4/pc-mounttray/pc-mounttray.pro

    r24ef714 r1b89eeb  
    9696 
    9797dotrans.path=/usr/local/share/pcbsd/i18n/ 
    98 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     98dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    9999 
    100100INSTALLS += target dotrans 
  • src-qt4/pc-netmanager/src/NetworkManager/NetworkManager.pro

    r24ef714 r1b89eeb  
    9595 
    9696resperm.path=/usr/local/share/pcbsd/pc-netmanager/ 
    97 resperm.extra=chmod 755 /usr/local/share/pcbsd/pc-netmanager/umts_stick 
     97resperm.extra=chmod 755 $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-netmanager/umts_stick 
    9898 
    9999dotrans.path=/usr/local/share/pcbsd/i18n/ 
    100 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     100dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    101101 
    102102INSTALLS+= target dotrans cpres resperm 
  • src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.pro

    r24ef714 r1b89eeb  
    7676 
    7777dotrans.path=/usr/local/share/pcbsd/i18n/ 
    78 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     78dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    7979 
    8080INSTALLS += dotrans target 
  • src-qt4/pc-netmanager/src/ethernetconfig/ethernetconfig.pro

    r24ef714 r1b89eeb  
    7979 
    8080dotrans.path=/usr/local/share/pcbsd/i18n/ 
    81 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     81dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    8282 
    8383INSTALLS += dotrans target 
  • src-qt4/pc-netmanager/src/wificonfig/wificonfig.pro

    r24ef714 r1b89eeb  
    7979 
    8080dotrans.path=/usr/local/share/pcbsd/i18n/ 
    81 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     81dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    8282 
    8383INSTALLS += dotrans target 
  • src-qt4/pc-pbigui/mkdirs.sh

    r1620346 r1b89eeb  
    66for i in $doDirs 
    77do 
    8   if [ ! -d "$i" ] ; then 
    9      echo "Creating directory: ${i}" 
    10      mkdir -p ${i} 
     8  if [ ! -d "${1}$i" ] ; then 
     9     echo "Creating directory: ${1}${i}" 
     10     mkdir -p ${1}${i} 
    1111  fi 
    1212done 
  • src-qt4/pc-pbigui/pc-pbigui.pro

    r24ef714 r1b89eeb  
    7575 
    7676dotrans.path=/usr/local/share/pcbsd/i18n/ 
    77 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     77dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    7878 
    7979dodirs.path=/usr/local/etc/xdg 
    80 dodirs.extra=sh mkdirs.sh 
     80dodirs.extra=sh mkdirs.sh $(INSTALL_ROOT) 
    8181 
    8282applnk.path=/usr/local/share/applications 
    83 applnk.extra=cd resources && xdg-desktop-menu install pcbsd-pbi.desktop 
     83applnk.files=resources/pcbsd-pbi.desktop 
     84 
     85defaultlist.path=/usr/local/share/applications 
     86defaultlist.files=resources/defaults.list 
    8487 
    8588mimexml.path=/usr/local/share/mime/packages 
    86 mimexml.extra=cd resources && xdg-mime install pcbsd-pbi.xml 
     89mimexml.files=resources/pcbsd-pbi.xml 
    8790 
    8891pbiimg.path=/usr/local/share/pcbsd/images/ 
     
    9396 
    9497runpbichmod.path=/usr/local/bin 
    95 runpbichmod.extra=chmod 755 /usr/local/bin/runpbi 
     98runpbichmod.extra=chmod 755 $(INSTALL_ROOT)/usr/local/bin/runpbi 
    9699 
    97100TARGET  = pc-pbigui 
    98101target.path = /usr/local/bin/ 
    99102 
    100 INSTALLS += target dodirs dotrans applnk pbiimg mimexml runpbibin runpbichmod 
     103INSTALLS += target dodirs dotrans applnk pbiimg mimexml runpbibin runpbichmod defaultlist 
    101104 
  • src-qt4/pc-pfmanager/pc-pfmanager.pro

    r24ef714 r1b89eeb  
    106106 
    107107dotrans.path=/usr/local/share/pcbsd/i18n/ 
    108 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     108dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    109109 
    110110INSTALLS += target dotrans 
  • src-qt4/pc-pkgmanager/pc-pkgmanager.pro

    r4e8b3af r1b89eeb  
    8383 
    8484dotrans.path=/usr/local/share/pcbsd/i18n/ 
    85 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     85dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    8686 
    8787appicon.path=/usr/local/share/pcbsd/icons 
  • src-qt4/pc-servicemanager/pc-servicemanager.pro

    r24ef714 r1b89eeb  
    8686 
    8787dotrans.path=/usr/local/share/pcbsd/i18n/ 
    88 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     88dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    8989 
    9090INSTALLS += target dotrans 
  • src-qt4/pc-softwaremanager/pc-softwaremanager.pro

    r867747a r1b89eeb  
    100100 
    101101dotrans.path=/usr/local/share/pcbsd/i18n/ 
    102 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     102dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    103103 
    104104symlnk.path=/usr/local/bin 
    105 symlnk.extra=ln -fs /usr/local/bin/pc-softwaremanager /usr/local/bin/appcafe 
     105symlnk.extra=ln -fs /usr/local/bin/pc-softwaremanager $(INSTALL_ROOT)/usr/local/bin/appcafe 
    106106 
    107107icons.path=/usr/local/share/pcbsd/icons 
  • src-qt4/pc-soundconfig/pc-soundconfig.pro

    r24ef714 r1b89eeb  
    8484 
    8585dotrans.path=/usr/local/share/pcbsd/i18n/ 
    86 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     86dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    8787 
    8888INSTALLS += target dotrans 
  • src-qt4/pc-sysmanager/pc-sysmanager.pro

    r24ef714 r1b89eeb  
    8686 
    8787dotrans.path=/usr/local/share/pcbsd/i18n/ 
    88 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     88dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    8989 
    9090desktop.path=/usr/local/share/applications/  
  • src-qt4/pc-systemupdatertray/pc-systemupdatertray.pro

    r24ef714 r1b89eeb  
    8181 
    8282dotrans.path=/usr/local/share/pcbsd/i18n/ 
    83 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     83dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    8484 
    8585desktop.path=/usr/local/share/applications/ 
  • src-qt4/pc-updategui/pc-updategui.pro

    r0f0d3e6 r1b89eeb  
    8383 
    8484dotrans.path=/usr/local/share/pcbsd/i18n/ 
    85 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     85dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    8686 
    8787icon.path=/usr/local/share/pcbsd/icons/ 
  • src-qt4/pc-usermanager/pc-usermanager.pro

    r24ef714 r1b89eeb  
    109109 
    110110dotrans.path=/usr/local/share/pcbsd/i18n/ 
    111 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     111dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    112112 
    113113INSTALLS += target dotrans 
  • src-qt4/pc-welcome/pc-welcome.pro

    r24ef714 r1b89eeb  
    8484 
    8585dotrans.path=/usr/local/share/pcbsd/i18n/ 
    86 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     86dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    8787 
    8888desktop.path=/usr/local/share/applications/  
  • src-qt4/pc-xgui/pc-xgui.pro

    r24ef714 r1b89eeb  
    105105nvdetect.files = resources/nvidia-detect/* 
    106106dotrans.path=/usr/local/share/pcbsd/i18n/ 
    107 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
    108 doarch.path=/usr/local/share/pcbsd/i18n/ 
    109 doarch.extra=sh install-arch.sh `pwd` 
     107dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    110108 
    111 INSTALLS += target bin scripts conf fluxbox carddetect settings temscripts temheader temdriver nvdetect dotrans doarch 
     109INSTALLS += target bin scripts conf fluxbox carddetect settings temscripts temheader temdriver nvdetect dotrans 
    112110 
  • src-qt4/port-files/Makefile

    r5e0ae79 r1b89eeb  
    3636WRKSRC=         ${WRKDIR}/src-qt4 
    3737HAS_CONFIGURE=  yes 
    38 NO_STAGE=       yes 
    3938 
    4039QMAKE_PRO=      src-qt4.pro 
     
    4342do-configure: 
    4443        @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ 
    45                 ${QMAKE} -unix CONFIG+="configure" ${QMAKE_PRO} 
     44                ${QMAKE} PREFIX=${PREFIX} -unix CONFIG+="configure" ${QMAKE_PRO} 
     45 
     46do-install: 
     47        cd ${WRKSRC} && make install INSTALL_ROOT=$(STAGEDIR) 
     48 
    4649 
    4750.include <bsd.port.mk> 
  • src-qt4/port-files/pkg-plist

    r197bdbf r1b89eeb  
    25532553share/PCDM/themes/default/virtualkeyboard.png 
    25542554share/mime/packages/pcbsd-pbi.xml 
    2555 share/icons/hicolor/64x64/mimetypes/application-pbi.png 
    2556 share/icons/hicolor/64x64/mimetypes/gnome-mime-application-pbi.png 
    25572555share/EasyPBI/EasyPBIicon.png 
    25582556share/applications/about.desktop 
     
    25692567share/applications/warden.desktop 
    25702568share/applications/EasyPBI.desktop 
    2571 share/gnome/apps/pcbsd-pbi.desktop 
    25722569lib/libpcbsd-ui.so.0.9.8 
    25732570lib/libpcbsd-ui.so 
     
    25822579include/pcbsd-utils.h 
    25832580include/pcbsd-ui.h 
    2584 @dirrmtry etc/xdg/applications-merged 
    2585 @dirrmtry etc/xdg/menus 
    25862581@dirrmtry etc/xdg/ 
    2587 @dirrmtry var/db 
    2588 @dirrmtry var 
    2589 @dirrmtry share/desktop-directories 
    2590 @dirrmtry share/mime/application 
    2591 @dirrmtry share/mime 
    25922582@dirrm share/warden/bin 
    25932583@dirrm share/warden/images 
     
    26402630@dirrm share/wallpapers/PCBSD 
    26412631@dirrm share/wallpapers 
    2642 @dirrmtry share/pcbsd/distfiles 
    2643 @dirrmtry share/pcbsd/xstartup 
    2644 @dirrmtry share/pcbsd/fluxboxinit 
    2645 @dirrmtry share/icons/hicolor/64x64/mimetypes 
    2646 @dirrmtry share/icons/hicolor/64x64 
    2647 @dirrmtry share/icons/hicolor 
    2648 @dirrmtry share/gnome/apps 
     2632@dirrmtry share/mime/packages 
    26492633@dirrmtry share/mime/application 
    2650 @dirrmtry share/mime/packages 
    26512634@dirrmtry share/mime 
    26522635@dirrm share/lifePreserver/i18n 
     
    26542637@dirrm share/lifePreserver/scripts 
    26552638@dirrmtry share/lifePreserver 
     2639@dirrmtry share/warden 
     2640@dirrmtry share/pcbsd/scripts 
     2641@dirrmtry share/pcbsd 
     2642@dirrmtry share/applications 
     2643@dirrmtry share/desktop-directories 
     2644@dirrmtry etc/xdg/menus 
     2645@dirrmtry etc/xdg/applications-merged 
     2646@dirrmtry etc/xdg 
  • src-qt4/qsudo/qsudo.pro

    rb633c064 r1b89eeb  
    8989 
    9090dotrans.path=/usr/local/share/pcbsd/i18n/ 
    91 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/ 
     91dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    9292 
    9393INSTALLS += target dotrans 
  • src-qt4/src-qt4.pro

    r6b3b3fb r1b89eeb  
    3535         PCDM 
    3636 
    37 doins.path=/usr/local/share/pcbsd/ 
    38 doins.extra=cd xtrafiles && sh install.sh 
     37doins.path=/ 
     38doins.extra=cd xtrafiles && sh install.sh $(INSTALL_ROOT)/usr/local 
    3939                 
    4040INSTALLS += doins 
  • src-qt4/warden-gui/warden-gui.pro

    r6c1dd87 r1b89eeb  
    111111 
    112112dotrans.path=/usr/local/share/warden/i18n/ 
    113 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/warden/i18n/ 
     113dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/warden/i18n/ 
    114114 
    115115desktop.path=/usr/local/share/applications/ 
  • src-qt4/xtrafiles/Makefile

    r1f0939e r1b89eeb  
    22# Makefile for building: pc-extractoverlay 
    33############################################################################# 
     4 
     5PREFIX?= /usr/local 
    46 
    57####### Install 
     
    810 
    911install_doinstall: 
    10         sh install.sh 
     12        sh install.sh $(INSTALL_ROOT)$(PREFIX) 
    1113 
    1214install:  install_doinstall 
  • src-qt4/xtrafiles/install.sh

    r1620346 r1b89eeb  
    11#!/bin/sh 
    22 
     3DEFAULT="/usr/local" 
     4 
     5if [ -z "$1" ] ; then 
     6        LB="${DEFAULT}" 
     7else 
     8        LB="${1}" 
     9fi 
     10 
     11echo "Installing extra files to ${LB}" 
     12 
    313# Copy files to system 
    4 tar cvf - -C local . 2>/dev/null | tar xvf - -C /usr/local 
     14tar cvf - -C local . 2>/dev/null | tar xvf - -C ${LB} 2>/dev/null 
    515if [ $? -ne 0 ] ; then 
    616  exit 1 
  • src-sh/Makefile

    r55ea386 rc60c604  
    2020CHK_DIR_EXISTS= test -d 
    2121MKDIR         = mkdir -p 
     22PREFIX?= $(STAGEDIR)/usr/local 
    2223SUBTARGETS    =  \ 
    2324                sub-libsh \ 
  • src-sh/about/Makefile

    r1620346 rc60c604  
    55####### Compiler, tools and options 
    66 
     7PREFIX?= /usr/local 
    78AR            = ar cqs 
    8 QMAKE         = /usr/local/bin/qmake-qt4 
    99TAR           = tar -cf 
    1010COMPRESS      = gzip -9f 
     
    3232 
    3333install_scripts: first FORCE 
    34         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    35         -$(INSTALL_FILE) about $(INSTALL_ROOT)/usr/local/bin/ 
     34        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     35        -$(INSTALL_FILE) about $(INSTALL_ROOT)$(PREFIX)/bin/ 
    3636 
    3737 
    3838uninstall_scripts:  FORCE 
    39         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/about 
    40         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     39        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/about 
     40        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    4141 
    4242 
    4343install_dochmod: first FORCE 
    44         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    45         chmod 755 /usr/local/bin/about 
     44        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     45        chmod 755 $(PREFIX)/bin/about 
    4646 
    4747 
  • src-sh/de-info/Makefile

    r1620346 rc60c604  
    44 
    55####### Compiler, tools and options 
    6  
     6PREFIX?= /usr/local 
    77AR            = ar cqs 
    88RANLIB        =  
     
    3131 
    3232install_scripts: first FORCE 
    33         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    34         -$(INSTALL_FILE) de-info $(INSTALL_ROOT)/usr/local/bin/ 
     33        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     34        -$(INSTALL_FILE) de-info $(INSTALL_ROOT)$(PREFIX)/bin/ 
    3535 
    3636uninstall_scripts:  FORCE 
    37         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/de-info 
    38         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     37        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/de-info 
     38        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    3939 
    4040install_dochmod: first FORCE 
    41         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    42         chmod 755 /usr/local/bin/de-info 
     41        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     42        chmod 755 $(PREFIX)/bin/de-info 
    4343 
    4444install_ddirs: first FORCE 
    45         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/de-profiles/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/de-profiles/  
    46         -$(INSTALL_DIR) de-profiles $(INSTALL_ROOT)/usr/local/share/pcbsd 
     45        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/de-profiles/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/de-profiles/  
     46        -$(INSTALL_DIR) de-profiles $(INSTALL_ROOT)$(PREFIX)/share/pcbsd 
    4747 
    4848uninstall_ddirs:  FORCE 
    49         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/de-profiles/  
     49        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/de-profiles/  
    5050 
    5151install:  install_scripts install_dochmod install_ddirs FORCE 
  • src-sh/libsh/Makefile

    r1620346 rc60c604  
    55####### Compiler, tools and options 
    66 
     7PREFIX?= /usr/local 
    78AR            = ar cqs 
    89TAR           = tar -cf 
     
    3132 
    3233install_scripts: first FORCE 
    33         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/ 
    34         -$(INSTALL_FILE) functions.sh $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/ 
     34        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/scripts/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/scripts/ 
     35        -$(INSTALL_FILE) functions.sh $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/scripts/ 
    3536 
    3637 
    3738uninstall_scripts:  FORCE 
    38         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/functions.sh 
    39         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts 
     39        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/scripts/functions.sh 
     40        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/scripts 
    4041 
    4142 
    4243install_dochmod: first FORCE 
    43         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/  
    44         chmod 755 /usr/local/share/pcbsd/scripts/functions.sh 
     44        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/scripts/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/scripts/  
     45        chmod 755 $(PREFIX)/share/pcbsd/scripts/functions.sh 
    4546 
    4647 
  • src-sh/lpreserver/Makefile

    rc684936 rc60c604  
    55####### Install 
    66 
     7PREFIX?= /usr/local 
     8 
    79all: 
    810 
    911install_doinstall: 
    10         sh install.sh 
     12        sh install.sh $(PREFIX) 
    1113 
    1214install:  install_doinstall 
  • src-sh/lpreserver/install.sh

    rc684936 rc60c604  
    11#!/bin/sh 
     2 
     3if [ -z "$1" ] ; then 
     4   STAGEDIR="/usr/local" 
     5else 
     6   STAGEDIR="$1" 
     7fi 
     8 
    29# lpreserver install script 
    3 PROGDIR="/usr/local/share/lpreserver" 
     10PROGDIR="${STAGEDIR}/share/lpreserver" 
    411 
    512mkdir -p ${PROGDIR} >/dev/null 2>/dev/null 
     
    815cd ${DIR} 
    916 
    10 cp lpreserver /usr/local/bin/lpreserver 
    11 chmod 755 /usr/local/bin/lpreserver 
     17cp lpreserver ${STAGEDIR}/bin/lpreserver 
     18chmod 755 ${STAGEDIR}/bin/lpreserver 
    1219 
    1320if [ -d "${PROGDIR}/backend" ] ; then 
  • src-sh/pbi-manager/Makefile

    r1620346 rc60c604  
    22# Makefile for building: pbi-manager 
    33############################################################################# 
     4 
     5PREFIX?= $(STAGEDIR) 
    46 
    57####### Install 
     
    810 
    911install_doinstall: 
    10         sh install.sh 
     12        sh install.sh $(PREFIX) 
    1113 
    1214install:  install_doinstall 
  • src-sh/pbi-manager/install.sh

    re747491 rc60c604  
    5353do 
    5454  rm ${LB}/man/man1/${i}.gz >/dev/null 2>/dev/null 
    55   cp man1/${i} ${LB}/man/man1/${i} 
     55  gzip -c man1/${i} > ${LB}/man/man1/${i}.gz 
    5656done 
    5757 
     
    6060do 
    6161  rm ${LB}/man/man5/${i}.gz >/dev/null 2>/dev/null 
    62   cp man5/${i} ${LB}/man/man5/${i} 
     62  gzip -c man5/${i} > ${LB}/man/man5/${i}.gz 
    6363done 
    6464 
     
    6868do 
    6969  rm ${LB}/man/man8/${i}.gz >/dev/null 2>/dev/null 
    70   cp man8/${i} ${LB}/man/man8/${i} 
     70  gzip -c man8/${i} > ${LB}/man/man8/${i}.gz 
    7171done 
    7272 
     
    8383 
    8484# If this is a new install, add the PC-BSD master repo 
    85 if [ ! -d "/var/db/pbi/keys" ] ; then 
    86         pbi_addrepo ${DIR}/repo/pcbsd.rpo 
    87 fi 
     85#if [ ! -d "/var/db/pbi/keys" ] ; then 
     86#       pbi_addrepo ${DIR}/repo/pcbsd.rpo 
     87#fi 
    8888 
    8989# Copy the default PC-BSD repo file 
     
    9797cp ${DIR}/etc/pbi.conf ${LB}/etc/pbi.conf 
    9898 
    99 if [ ! -d "/usr/pbi" ] ; then mkdir /usr/pbi ; fi 
    100  
    10199# Create the wrapper binary 
    102100cd ${DIR}/wrapper 
     
    104102  # Build 32bit wrapper 
    105103  echo "Building i386 wrapper..." 
    106   rm .pbiwrapper >/dev/null 2>/dev/null 
     104  rm pbiwrapper >/dev/null 2>/dev/null 
    107105  make clean 
    108106  make DEFINES="-mtune=i386 -march=i386 -m32" 
    109107  make install 
    110   chown root:wheel /usr/pbi/.pbiwrapper  
    111   chmod 644 /usr/pbi/.pbiwrapper 
    112   mv /usr/pbi/.pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-i386 
     108  chown root:wheel pbiwrapper  
     109  chmod 644 pbiwrapper 
     110  mv pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-i386 
    113111else 
    114112  touch ${LB}/share/pbi-manager/.pbiwrapper-i386 
     
    119117DEFINES="" 
    120118export DEFINES 
    121 rm .pbiwrapper >/dev/null 2>/dev/null 
     119rm pbiwrapper >/dev/null 2>/dev/null 
    122120make clean 
    123121make DEFINES="" 
    124122make install DEFINES="" 
    125 chown root:wheel /usr/pbi/.pbiwrapper  
    126 chmod 644 /usr/pbi/.pbiwrapper 
    127 mv /usr/pbi/.pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-`uname -m` 
     123chown root:wheel pbiwrapper  
     124chmod 644 pbiwrapper 
     125mv pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-`uname -m` 
  • src-sh/pbi-manager/man5/pbi.conf.5

    r1620346 r1b89eeb  
    2727.It PBI_PROXYPASS: 
    2828Password for authentication to the specified proxy server.  
     29.It PBI_FBSDMAJOR: 
     30Major release of FreeBSD to pull PBIs for, usually set to 9 or 10 
    2931.Sh SEE ALSO 
    3032.Xr pbi_add 1 , 
  • src-sh/pbi-manager/pbi-manager

    re858767 rc60c604  
    75177517 
    75187518# Source our shared PCBSD functions 
    7519 . /usr/local/share/pcbsd/scripts/functions.sh 
     7519if [ -z "$ALTPROGPREFIX" ] ; then 
     7520  . ${ALTPROGPREFIX}/share/pcbsd/scripts/functions.sh 
     7521else 
     7522  . /usr/local/share/pcbsd/scripts/functions.sh 
     7523fi 
    75207524 
    75217525# Set the default umask 
  • src-sh/pbi-manager/wrapper/Makefile

    r1620346 rc60c604  
    1515AR            = ar cqs 
    1616RANLIB        =  
    17 QMAKE         = /usr/local/bin/qmake-qt4 
    1817TAR           = tar -cf 
    1918COMPRESS      = gzip -9f 
     
    4140SOURCES       = main.c  
    4241OBJECTS       = main.o 
    43 MAKE_TARGET   = .pbiwrapper 
    44 DESTDIR       = /usr/pbi/ 
    45 TARGET        = .pbiwrapper 
     42MAKE_TARGET   = pbiwrapper 
     43TARGET        = pbiwrapper 
    4644 
    4745first: all 
     
    7068 
    7169$(TARGET):  $(OBJECTS)   
    72         @$(CHK_DIR_EXISTS) /usr/pbi/ || $(MKDIR) /usr/pbi/ 
    7370        $(CC) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) 
    7471 
     
    125122 
    126123install_scripts: first FORCE 
    127         -@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/pbi || $(MKDIR) $(INSTALL_ROOT)/usr/pbi/ 
    128         -$(INSTALL_FILE) .pbiwrapper $(INSTALL_ROOT)/usr/pbi/.pbiwrapper 
    129124 
    130125install:   FORCE install_scripts 
  • src-sh/pbi-manager10/Makefile

    r651bd28 rc60c604  
    22# Makefile for building: pbi-manager 
    33############################################################################# 
     4 
     5PREFIX?= /usr/local 
    46 
    57####### Install 
     
    810 
    911install_doinstall: 
    10         sh install.sh 
     12        sh install.sh $(PREFIX) 
    1113 
    1214install:  install_doinstall 
  • src-sh/pbreg/Makefile

    r1620346 rc60c604  
    55####### Compiler, tools and options 
    66 
     7PREFIX?= /usr/local 
    78AR            = ar cqs 
    89TAR           = tar -cf 
     
    3132 
    3233install_scripts: first FORCE 
    33         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    34         -$(INSTALL_FILE) pbreg $(INSTALL_ROOT)/usr/local/bin/ 
     34        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     35        -$(INSTALL_FILE) pbreg $(INSTALL_ROOT)$(PREFIX)/bin/ 
    3536 
    3637 
    3738uninstall_scripts:  FORCE 
    38         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/pbreg 
    39         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     39        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/pbreg 
     40        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    4041 
    4142 
    4243install_dochmod: first FORCE 
    43         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    44         chmod 755 /usr/local/bin/pbreg 
     44        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     45        chmod 755 $(PREFIX)/bin/pbreg 
    4546 
    4647 
  • src-sh/pc-adctl/bin/Makefile

    r1620346 rc60c604  
     1PREFIX?= /usr/local 
     2 
    13FILES=pc-adctl pc-ldapctl 
    24 
    35FILESMODE=0555 
    4 FILESDIR=/usr/local/bin 
     6FILESDIR=$(PREFIX)/bin 
    57NO_OBJ= 
    68 
  • src-sh/pc-adctl/conf/Makefile

    r5e00148 rc60c604  
     1PREFIX?= /usr/local 
    12FILES=pc-activedirectory.conf pc-ldap.conf 
    23 
    34FILESMODE=0400 
    4 FILESDIR=/usr/local/etc/ 
     5FILESDIR=$(PREFIX)/etc/ 
    56NO_OBJ= 
    67 
  • src-sh/pc-adctl/pc-krbconf/Makefile

    r1620346 rc60c604  
    55.include <bsd.own.mk> 
    66 
     7PREFIX?= /usr/local 
    78MAN= 
    89PROGOWN=        root 
    910PROGGRP=        wheel 
    1011PROGMODE=       0555 
    11 DESTDIR=        /usr/local/bin 
     12DESTDIR=        $(PREFIX)/bin 
    1213 
    1314PROG=   pc-krbconf 
  • src-sh/pc-adctl/pc-ldapconf/Makefile

    r1620346 rc60c604  
    55.include <bsd.own.mk> 
    66 
     7PREFIX?= /usr/local 
    78MAN= 
    89PROGOWN=        root 
    910PROGGRP=        wheel 
    1011PROGMODE=       0555 
    11 DESTDIR=        /usr/local/bin 
     12DESTDIR=        $(PREFIX)/bin 
    1213 
    1314PROG=   pc-ldapconf 
  • src-sh/pc-adctl/pc-nssconf/Makefile

    r1620346 rc60c604  
    55.include <bsd.own.mk> 
    66 
     7PREFIX?= /usr/local 
    78MAN= 
    89PROGOWN=        root 
    910PROGGRP=        wheel 
    1011PROGMODE=       0555 
    11 DESTDIR=        /usr/local/bin 
     12DESTDIR=        $(PREFIX)/bin 
    1213 
    1314PROG=   pc-nssconf 
  • src-sh/pc-adctl/pc-nssldapconf/Makefile

    r1620346 rc60c604  
    55.include <bsd.own.mk> 
    66 
     7PREFIX?= /usr/local 
    78MAN= 
    89PROGOWN=        root 
    910PROGGRP=        wheel 
    1011PROGMODE=       0555 
    11 DESTDIR=        /usr/local/bin 
     12DESTDIR=        $(PREFIX)/bin 
    1213 
    1314PROG=   pc-nssldapconf 
  • src-sh/pc-adctl/pc-pamconf/Makefile

    r1620346 rc60c604  
    55.include <bsd.own.mk> 
    66 
     7PREFIX?= /usr/local 
    78MAN= 
    89PROGOWN=        root 
    910PROGGRP=        wheel 
    1011PROGMODE=       0555 
    11 DESTDIR=        /usr/local/bin 
     12DESTDIR=        $(PREFIX)/bin 
    1213 
    1314PROG=   pc-pamconf 
  • src-sh/pc-adctl/pc-sambaconf/Makefile

    r1620346 rc60c604  
    55.include <bsd.own.mk> 
    66 
     7PREFIX?= /usr/local 
    78MAN= 
    89PROGOWN=        root 
    910PROGGRP=        wheel 
    1011PROGMODE=       0555 
    11 DESTDIR=        /usr/local/bin 
     12DESTDIR=        $(PREFIX)/bin 
    1213 
    1314PROG=   pc-sambaconf 
  • src-sh/pc-adctl/rc/Makefile

    r1620346 rc60c604  
     1PREFIX?= /usr/local 
    12FILES=rc.activedirectory rc.ldap 
    23 
    34FILESMODE=0444 
    4 FILESDIR=/usr/local/etc/ 
     5FILESDIR=$(PREFIX)/etc/ 
    56NO_OBJ= 
    67 
  • src-sh/pc-adctl/scripts/Makefile

    r1620346 rc60c604  
     1PREFIX?= /usr/local 
    12FILES=pc-activedirectory pc-kerberos pc-kinit pc-nsswitch pc-pam \ 
    23        pc-samba pc-ldap pc-nssldap pc-directory 
    34 
    45FILESMODE=0555 
    5 FILESDIR=/usr/local/etc/rc.d 
     6FILESDIR=$(PREFIX)/etc/rc.d 
    67NO_OBJ= 
    78 
  • src-sh/pc-checkxdisplay/Makefile

    r1620346 rc60c604  
    33############################################################################# 
    44 
     5PREFIX?= /usr/local 
    56FILE          = pc-checkxdisplay 
    67AR            = ar cqs 
     
    2829 
    2930install_scripts: first FORCE 
    30         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    31         -$(INSTALL_FILE) $(FILE) $(INSTALL_ROOT)/usr/local/bin/ 
     31        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     32        -$(INSTALL_FILE) $(FILE) $(INSTALL_ROOT)$(PREFIX)/bin/ 
    3233 
    3334 
    3435uninstall_scripts:  FORCE 
    35         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/$(FILE) 
    36         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     36        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/$(FILE) 
     37        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    3738 
    3839 
    3940install_dochmod: first FORCE 
    40         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    41         chmod 755 /usr/local/bin/$(FILE) 
     41        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     42        chmod 755 $(PREFIX)/bin/$(FILE) 
    4243 
    4344 
  • src-sh/pc-extractoverlay/Makefile

    r1620346 rc60c604  
    22# Makefile for building: pc-extractoverlay 
    33############################################################################# 
     4 
     5PREFIX?= /usr/local 
    46 
    57####### Install 
     
    810 
    911install_doinstall: 
    10         sh install.sh 
     12        sh install.sh $(PREFIX) 
    1113 
    1214install:  install_doinstall 
  • src-sh/pc-extractoverlay/install.sh

    r1620346 rc60c604  
    11#!/bin/sh 
    22 
    3 cp pc-extractoverlay /usr/local/bin/pc-extractoverlay 
     3DEFAULT="/usr/local" 
     4 
     5if [ -z "$1" ] ; then 
     6        LB="${DEFAULT}" 
     7else 
     8        LB="${1}" 
     9fi 
     10 
     11cp pc-extractoverlay ${LB}/bin/pc-extractoverlay 
    412if [ $? -ne 0 ] ; then 
    513  exit 1 
    614fi 
    7 chmod 755 /usr/local/bin/pc-extractoverlay 
     15chmod 755 ${LB}/bin/pc-extractoverlay 
    816if [ $? -ne 0 ] ; then 
    917  exit 1 
    1018fi 
    1119 
    12 if [ ! -d "/usr/local/share/pcbsd/conf" ] ; then 
    13   mkdir -p /usr/local/share/pcbsd/conf 
     20if [ ! -d "${LB}/share/pcbsd/conf" ] ; then 
     21  mkdir -p ${LB}/share/pcbsd/conf 
    1422fi 
    15 if [ ! -d "/usr/local/share/pcbsd/distfiles" ] ; then 
    16   mkdir -p /usr/local/share/pcbsd/distfiles 
     23if [ ! -d "${LB}/share/pcbsd/distfiles" ] ; then 
     24  mkdir -p ${LB}/share/pcbsd/distfiles 
    1725fi 
    1826 
    1927# Copy port prune list 
    20 cp prune-port-files /usr/local/share/pcbsd/conf 
     28cp prune-port-files ${LB}/share/pcbsd/conf 
    2129if [ $? -ne 0 ] ; then 
    2230  exit 1 
     
    2432 
    2533# Copy exclude list 
    26 cp port-excludes /usr/local/share/pcbsd/conf 
     34cp port-excludes ${LB}/share/pcbsd/conf 
    2735if [ $? -ne 0 ] ; then 
    2836  exit 1 
    2937fi 
    30 cp desktop-excludes /usr/local/share/pcbsd/conf 
     38cp desktop-excludes ${LB}/share/pcbsd/conf 
    3139if [ $? -ne 0 ] ; then 
    3240  exit 1 
    3341fi 
    34 cp server-excludes /usr/local/share/pcbsd/conf 
     42cp server-excludes ${LB}/share/pcbsd/conf 
    3543if [ $? -ne 0 ] ; then 
    3644  exit 1 
     
    3846 
    3947# Now create overlay.txz file 
    40 tar cvJf /usr/local/share/pcbsd/distfiles/port-overlay.txz -C ports-overlay . 
     48tar cvJ --uname "root" --gname "wheel" -f ${LB}/share/pcbsd/distfiles/port-overlay.txz -C ports-overlay . 
    4149if [ $? -ne 0 ] ; then 
    4250  exit 1 
     
    4452 
    4553# Now create desktop-overlay.txz file 
    46 tar cvJf /usr/local/share/pcbsd/distfiles/desktop-overlay.txz -C desktop-overlay . 
     54tar cvJ --uname "root" --gname "wheel" -f ${LB}/share/pcbsd/distfiles/desktop-overlay.txz -C desktop-overlay . 
    4755if [ $? -ne 0 ] ; then 
    4856  exit 1 
     
    5058 
    5159# Now create server-overlay.txz file 
    52 tar cvJf /usr/local/share/pcbsd/distfiles/server-overlay.txz -C server-overlay . 
     60tar cvJ --uname "root" --gname "wheel" -f ${LB}/share/pcbsd/distfiles/server-overlay.txz -C server-overlay . 
    5361if [ $? -ne 0 ] ; then 
    5462  exit 1 
  • src-sh/pc-fbsdupdatecheck/Makefile

    r1620346 rc60c604  
    11############################################################################# 
    2 # Makefile for building: /usr/local/bin/pc-fbsdupdatecheck 
     2# Makefile for building: $(PREFIX)/bin/pc-fbsdupdatecheck 
    33############################################################################# 
     4PREFIX?= /usr/local 
    45 
    56####### Compiler, tools and options 
     
    1011CFLAGS        = -pipe -O2 -Wall -W $(DEFINES) 
    1112CXXFLAGS      = -pipe -O2 -Wall -W $(DEFINES) 
    12 INCPATH       = -I/usr/local/include -I. -I/usr/local/include 
    1313LINK          = g++ 
    1414LFLAGS        = -Wl,-O1 -pthread 
     
    1616AR            = ar cqs 
    1717RANLIB        =  
    18 QMAKE         = /usr/local/bin/qmake-qt4 
    1918TAR           = tar -cf 
    2019COMPRESS      = gzip -9f 
     
    4342OBJECTS       = main.o 
    4443MAKE_TARGET   = pc-fbsdupdatecheck 
    45 DESTDIR       = /usr/local/bin/ 
     44DESTDIR       = $(PREFIX)/bin/ 
    4645TARGET        = pc-fbsdupdatecheck 
    4746 
     
    7170 
    7271$(TARGET):  $(OBJECTS)   
    73         @$(CHK_DIR_EXISTS) /usr/local/bin/ || $(MKDIR) /usr/local/bin/  
     72        @$(CHK_DIR_EXISTS) $(PREFIX)/bin/ || $(MKDIR) $(PREFIX)/bin/  
    7473        $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) 
    7574 
     
    126125 
    127126install_scripts: first FORCE 
    128         -@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/ 
    129         -$(INSTALL_FILE) pc-fbsdupdatecheck $(INSTALL_ROOT)/usr/local/bin/ 
     127        -@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/ 
     128        -$(INSTALL_FILE) pc-fbsdupdatecheck $(INSTALL_ROOT)$(PREFIX)/bin/ 
    130129 
    131130install:   FORCE install_scripts 
  • src-sh/pc-firstgui/Makefile

    r1620346 rc60c604  
    44 
    55####### Compiler, tools and options 
     6 
     7PREFIX?= /usr/local 
    68 
    79AR            = ar cqs 
     
    3133 
    3234install_scripts: first FORCE 
    33         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    34         -$(INSTALL_FILE) pc-firstgui $(INSTALL_ROOT)/usr/local/bin/ 
     35        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     36        -$(INSTALL_FILE) pc-firstgui $(INSTALL_ROOT)$(PREFIX)/bin/ 
    3537 
    3638 
    3739uninstall_scripts:  FORCE 
    38         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/pc-firstgui 
    39         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     40        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/pc-firstgui 
     41        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    4042 
    4143 
    4244install_dochmod: first FORCE 
    43         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    44         chmod 755 /usr/local/bin/pc-firstgui 
     45        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     46        chmod 755 $(PREFIX)/bin/pc-firstgui 
    4547 
    4648 
  • src-sh/pc-metapkgmanager/Makefile

    r1620346 rc60c604  
    44 
    55####### Compiler, tools and options 
     6 
     7PREFIX?= /usr/local 
    68 
    79AR            = ar cqs 
     
    3133 
    3234install_scripts: first FORCE 
    33         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    34         -$(INSTALL_FILE) pc-metapkgmanager $(INSTALL_ROOT)/usr/local/bin/ 
    35         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/ 
    36         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/metaset/ || rm -rf /usr/local/share/pcbsd/metaset 
    37         cp -r metaset /usr/local/share/pcbsd/metaset 
    38         cd /usr/local/bin/ && ln -f pc-metapkgmanager pc-pkg 
     35        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     36        -$(INSTALL_FILE) pc-metapkgmanager $(INSTALL_ROOT)$(PREFIX)/bin/ 
     37        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/ 
     38        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/metaset/ || rm -rf $(PREFIX)/share/pcbsd/metaset 
     39        cp -r metaset $(PREFIX)/share/pcbsd/metaset 
     40        cd $(PREFIX)/bin/ && ln -f pc-metapkgmanager pc-pkg 
    3941 
    4042uninstall_scripts:  FORCE 
    41         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/pc-metapkgmanager 
    42         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     43        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/pc-metapkgmanager 
     44        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    4345 
    4446install_dochmod: first FORCE 
    45         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    46         chmod 755 /usr/local/bin/pc-metapkgmanager 
     47        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     48        chmod 755 $(PREFIX)/bin/pc-metapkgmanager 
    4749 
    4850install:  install_scripts install_dochmod  FORCE 
  • src-sh/pc-runxgui/Makefile

    r1620346 rc60c604  
    22# Makefile for building: pc-runxgui 
    33############################################################################# 
     4 
     5PREFIX?= /usr/local 
    46 
    57AR            = ar cqs 
     
    2729 
    2830install_scripts: first FORCE 
    29         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    30         -$(INSTALL_FILE) pc-runxgui $(INSTALL_ROOT)/usr/local/bin/ 
     31        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     32        -$(INSTALL_FILE) pc-runxgui $(INSTALL_ROOT)$(PREFIX)/bin/ 
    3133 
    3234 
    3335uninstall_scripts:  FORCE 
    34         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/pc-runxgui 
    35         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     36        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/pc-runxgui 
     37        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    3638 
    3739 
    3840install_dochmod: first FORCE 
    39         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    40         chmod 755 /usr/local/bin/pc-runxgui 
     41        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     42        chmod 755 $(PREFIX)/bin/pc-runxgui 
    4143 
    4244 
  • src-sh/pc-su/Makefile

    r1620346 rc60c604  
    55####### Compiler, tools and options 
    66 
     7PREFIX?= /usr/local 
     8 
    79AR            = ar cqs 
    8 QMAKE         = /usr/local/bin/qmake-qt4 
    910TAR           = tar -cf 
    1011COMPRESS      = gzip -9f 
     
    3233 
    3334install_scripts: first FORCE 
    34         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    35         -$(INSTALL_FILE) pc-su $(INSTALL_ROOT)/usr/local/bin/ 
     35        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     36        -$(INSTALL_FILE) pc-su $(INSTALL_ROOT)$(PREFIX)/bin/ 
    3637 
    3738 
    3839uninstall_scripts:  FORCE 
    39         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/pc-su 
    40         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     40        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/pc-su 
     41        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    4142 
    4243 
    4344install_dochmod: first FORCE 
    44         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    45         chmod 755 /usr/local/bin/pc-su 
     45        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     46        chmod 755 $(PREFIX)/bin/pc-su 
    4647 
    4748 
  • src-sh/pc-sysinstall/Makefile

    r1620346 rc60c604  
    22# Makefile for building: pc-sysinstall 
    33############################################################################# 
     4PREFIX?= /usr/local 
    45 
    56####### Install 
     
    89 
    910install_doinstall: 
    10         sh install.sh 
     11        sh install.sh $(PREFIX) 
    1112 
    1213install: install_doinstall 
  • src-sh/pc-sysinstall/install.sh

    r1620346 rc60c604  
    11#!/bin/sh 
    22 
    3 if [ -z "$LOCALBASE" ] ; then 
     3if [ -z "$1" ] ; then 
    44   LOCALBASE=/usr/local 
     5else 
     6   LOCALBASE="$1" 
    57fi 
    68 
     
    2729    rm ${LOCALBASE}/man/man8/${i}.gz >/dev/null 2>/dev/null 
    2830  fi 
    29   cp man8/${i} ${LOCALBASE}/man/man8/${i} 
     31  gzip -c man8/${i} > ${LOCALBASE}/man/man8/${i}.gz 
    3032done 
    3133 
  • src-sh/pc-thinclient/Makefile

    r1620346 rc60c604  
    22# Makefile for building: pc-xdgutil 
    33############################################################################# 
     4 
     5PREFIX?= /usr/local 
    46 
    57AR            = ar cqs 
     
    2729 
    2830install_scripts: first FORCE 
    29         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    30         -$(INSTALL_FILE) pc-thinclient $(INSTALL_ROOT)/usr/local/bin/ 
     31        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     32        -$(INSTALL_FILE) pc-thinclient $(INSTALL_ROOT)$(PREFIX)/bin/ 
    3133 
    3234 
    3335uninstall_scripts:  FORCE 
    34         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/pc-thinclient 
    35         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     36        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/pc-thinclient 
     37        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    3638 
    3739 
    3840install_dochmod: first FORCE 
    39         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    40         chmod 755 /usr/local/bin/pc-thinclient 
     41        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     42        chmod 755 $(PREFIX)/bin/pc-thinclient 
    4143 
    4244 
    4345install_ddirs: first FORCE 
    44         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-thinclient/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-thinclient/  
    45         -$(INSTALL_DIR) resources $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-thinclient/ 
     46        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-thinclient/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-thinclient/  
     47        -$(INSTALL_DIR) resources $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-thinclient/ 
    4648 
    4749uninstall_ddirs:  FORCE 
    48         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-thinclient/resources 
    49         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-thinclient/  
     50        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-thinclient/resources 
     51        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-thinclient/  
    5052 
    5153install:  install_scripts install_dochmod install_ddirs  FORCE 
  • src-sh/pc-updatemanager/Makefile

    r1620346 rc60c604  
    22# Makefile for building: pc-updatemanager 
    33############################################################################# 
     4 
     5PREFIX?= /usr/local 
    46 
    57AR            = ar cqs 
     
    2729 
    2830install_scripts: first FORCE 
    29         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    30         -$(INSTALL_FILE) pc-updatemanager $(INSTALL_ROOT)/usr/local/bin/ 
     31        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     32        -$(INSTALL_FILE) pc-updatemanager $(INSTALL_ROOT)$(PREFIX)/bin/ 
    3133 
    3234 
    3335uninstall_scripts:  FORCE 
    34         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/pc-updatemanager 
    35         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     36        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/pc-updatemanager 
     37        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    3638 
    3739 
    3840install_dochmod: first FORCE 
    39         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    40         chmod 755 /usr/local/bin/pc-updatemanager 
     41        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     42        chmod 755 $(PREFIX)/bin/pc-updatemanager 
    4143 
    4244install_conf: first FORCE 
    43         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-updatemanager/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-updatemanager/  
    44         -$(INSTALL_DIR) conf $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-updatemanager/ 
     45        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-updatemanager/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-updatemanager/  
     46        -$(INSTALL_DIR) conf $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-updatemanager/ 
    4547 
    4648 
    4749uninstall_conf:  FORCE 
    48         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-updatemanager/conf 
    49         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-updatemanager 
     50        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-updatemanager/conf 
     51        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-updatemanager 
    5052 
    5153 
  • src-sh/pc-xdgutil/Makefile

    r1620346 rc60c604  
    33############################################################################# 
    44 
     5PREFIX?= /usr/local 
    56AR            = ar cqs 
    67RANLIB        =  
    7 QMAKE         = /usr/local/bin/qmake-qt4 
    88TAR           = tar -cf 
    99COMPRESS      = gzip -9f 
     
    2828 
    2929install_scripts: first FORCE 
    30         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    31         -$(INSTALL_FILE) pc-xdgutil $(INSTALL_ROOT)/usr/local/bin/ 
     30        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     31        -$(INSTALL_FILE) pc-xdgutil $(INSTALL_ROOT)$(PREFIX)/bin/ 
    3232 
    3333 
    3434uninstall_scripts:  FORCE 
    35         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/bin/pc-xdgutil 
    36         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/  
     35        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/bin/pc-xdgutil 
     36        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
    3737 
    3838 
    3939install_dochmod: first FORCE 
    40         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/  
    41         chmod 755 /usr/local/bin/pc-xdgutil 
     40        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/  
     41        chmod 755 $(PREFIX)/bin/pc-xdgutil 
    4242 
    4343 
    4444install_ddirs: first FORCE 
    45         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/  
    46         -$(INSTALL_DIR) desktop-dirs $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/ 
     45        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/  
     46        -$(INSTALL_DIR) desktop-dirs $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/ 
    4747 
    4848 
    4949uninstall_ddirs:  FORCE 
    50         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/desktop-dirs 
    51         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/  
     50        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/desktop-dirs 
     51        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/  
    5252 
    5353 
    5454install_xdgmenu: first FORCE 
    55         @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/  
    56         -$(INSTALL_FILE) menus/applications.menu $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/ 
    57         -$(INSTALL_FILE) menus/xfce-applications.menu $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/ 
     55        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/  
     56        -$(INSTALL_FILE) menus/applications.menu $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/ 
     57        -$(INSTALL_FILE) menus/xfce-applications.menu $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/ 
    5858 
    5959 
    6060uninstall_xdgmenu:  FORCE 
    61         -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/applications.menu  
    62          -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/xfce-applications.menu 
    63         -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-xdgutil/  
     61        -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/applications.menu  
     62         -$(DEL_FILE) -r $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/xfce-applications.menu 
     63        -$(DEL_DIR) $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-xdgutil/  
    6464 
    6565install:  install_scripts install_dochmod install_ddirs install_xdgmenu  FORCE 
  • src-sh/port-files/Makefile

    r5e0ae79 rc60c604  
    2828CONFLICTS?=     pbi-manager-[0-9]* 
    2929NO_BUILD=       yes 
    30 NO_STAGE=       yes 
    3130USE_BZIP2=      yes 
    3231USE_PYTHON=     yes 
    33  
    34 MAN1=           pbi_add.1 pbi_browser.1 pbi_create.1 \ 
    35                 pbi_delete.1 \ 
    36                 pbi_icon.1 pbi_indextool.1 pbi_info.1 \ 
    37                 pbi_listrepo.1 pbi_update.1 \ 
    38                 pbi_metatool.1 \ 
    39                 pbi_patch.1 \ 
    40                 pbi_update_hashdir.1 
    41 MAN5=           pbi.conf.5 
    42 MAN8=           pbi_addrepo.8 pbi_autobuild.8 pbi_deleterepo.8 \ 
    43                 pbi_makepatch.8 pbi_makeport.8 pbi_makerepo.8 pbid.8 \ 
    44                 pc-sysinstall.8 
    4532 
    4633.include <bsd.port.pre.mk> 
    4734 
    4835do-install: 
    49         cd ${WRKSRC} && make install 
     36        cd ${WRKSRC} && make install PREFIX=$(STAGEDIR)$(PREFIX) 
    5037 
    5138post-install: 
    52         PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL 
     39        PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL 
    5340 
    5441.include <bsd.port.post.mk> 
  • src-sh/port-files/pkg-install

    re128d77 rc60c604  
    55 
    66if [ "$2" != "POST-INSTALL" ] ; then 
     7   exit 0 
     8fi 
     9 
     10# If this is during staging, we can skip for now 
     11echo $PREFIX | grep -q '/stage/' 
     12if [ $? -eq 0 ] ; then 
    713   exit 0 
    814fi 
  • src-sh/port-files/pkg-plist

    r4023a66 r1b89eeb  
    625625share/pbi-manager/icons/patch.png 
    626626share/pbi-manager/pcbsd.rpo 
     627man/man1/pbi_add.1.gz 
     628man/man1/pbi_browser.1.gz 
     629man/man1/pbi_create.1.gz 
     630man/man1/pbi_delete.1.gz 
     631man/man1/pbi_icon.1.gz 
     632man/man1/pbi_indextool.1.gz 
     633man/man1/pbi_info.1.gz 
     634man/man1/pbi_listrepo.1.gz 
     635man/man1/pbi_update.1.gz 
     636man/man1/pbi_metatool.1.gz 
     637man/man1/pbi_patch.1.gz 
     638man/man1/pbi_update_hashdir.1.gz 
     639man/man5/pbi.conf.5.gz 
     640man/man8/pbi_addrepo.8.gz 
     641man/man8/pbi_autobuild.8.gz 
     642man/man8/pbi_deleterepo.8.gz 
     643man/man8/pbi_makepatch.8.gz 
     644man/man8/pbi_makeport.8.gz 
     645man/man8/pbi_makerepo.8.gz 
     646man/man8/pbid.8.gz 
     647man/man8/pc-sysinstall.8.gz 
    627648@dirrm share/pbi-manager/module-examples/firefox/resources 
    628649@dirrm share/pbi-manager/module-examples/firefox/scripts 
     
    655676@dirrm share/pc-sysinstall/examples 
    656677@dirrm share/pc-sysinstall 
    657 @dirrmtry share/pcbsd/icons 
    658678@dirrm share/pcbsd/metaset/trueos/File-Servers 
    659679@dirrm share/pcbsd/metaset/trueos/PostgreSQL 
     
    756776@dirrm share/lpreserver/backend 
    757777@dirrm share/lpreserver 
    758 @unexec rmdir /usr/pbi/.hashdir >/dev/null 2>/dev/null 
    759 @unexec rmdir /usr/pbi/share/applications >/dev/null 2>/dev/null 
    760 @unexec rmdir /usr/pbi/share/desktop-directories >/dev/null 2>/dev/null 
    761 @unexec rmdir /usr/pbi/share/icons/hicolor >/dev/null 2>/dev/null 
    762 @unexec rmdir /usr/pbi/share/icons >/dev/null 2>/dev/null 
    763 @unexec rmdir /usr/pbi/share/mime/packages >/dev/null 2>/dev/null 
    764 @unexec rmdir /usr/pbi/share/mime >/dev/null 2>/dev/null 
    765 @unexec rmdir /usr/pbi/share >/dev/null 2>/dev/null 
    766 @unexec rmdir /usr/pbi/etc/xdg/menus >/dev/null 2>/dev/null 
    767 @unexec rmdir /usr/pbi/etc/xdg >/dev/null 2>/dev/null 
    768 @unexec rmdir /usr/pbi/etc >/dev/null 2>/dev/null 
    769 @unexec rm /usr/pbi/.pbiwrapper-amd64 >/dev/null 2>/dev/null 
    770 @unexec rm /usr/pbi/.pbiwrapper-i386 >/dev/null 2>/dev/null 
    771 @unexec rmdir /usr/pbi >/dev/null 2>/dev/null 
     778@dirrmtry share/mime/application 
     779@dirrmtry share/desktop-directories 
     780@dirrmtry etc/xdg/menus 
     781@dirrmtry etc/xdg/applications-merged 
  • src-sh/warden/Makefile

    r1620346 rc60c604  
    22# Makefile for building: warden  
    33############################################################################# 
     4 
     5PREFIX?= /usr/local 
    46 
    57####### Install 
     
    810 
    911install_doinstall: 
    10         sh install.sh 
     12        sh install.sh $(PREFIX) 
    1113 
    1214install:  install_doinstall 
  • src-sh/warden/install.sh

    r1620346 rc60c604  
    11#!/bin/sh 
    22# Warden install script 
    3 PROGDIR="/usr/local/share/warden" 
     3 
     4DEFAULT="/usr/local" 
     5 
     6if [ -z "$1" ] ; then 
     7        LB="${DEFAULT}" 
     8else 
     9        LB="${1}" 
     10fi 
     11 
     12PROGDIR="${LB}/share/warden" 
    413 
    514mkdir -p ${PROGDIR} >/dev/null 2>/dev/null 
     
    1120cd ${DIR} 
    1221 
    13 cp bin/warden /usr/local/bin/warden 
    14 chmod 755 /usr/local/bin/warden 
     22cp bin/warden ${LB}/bin/warden 
     23chmod 755 ${LB}/bin/warden 
    1524 
    1625# Save existing settings  
    17 if [ -e "/usr/local/etc/warden.conf" ] ; then 
    18   NIC=`grep '^NIC:' /usr/local/etc/warden.conf | awk '{print $2}'` 
    19   WTMP=`grep '^WTMP:' /usr/local/etc/warden.conf | awk '{print $2}'` 
    20   JDIR=`grep '^JDIR:' /usr/local/etc/warden.conf | awk '{print $2}'` 
     26if [ -e "${LB}/etc/warden.conf" ] ; then 
     27  NIC=`grep '^NIC:' ${LB}/etc/warden.conf | awk '{print $2}'` 
     28  WTMP=`grep '^WTMP:' ${LB}/etc/warden.conf | awk '{print $2}'` 
     29  JDIR=`grep '^JDIR:' ${LB}/etc/warden.conf | awk '{print $2}'` 
    2130  ONIC=`grep '^NIC:' conf/warden.conf` 
    2231  OWTMP=`grep '^WTMP:' conf/warden.conf` 
     
    2433fi 
    2534 
    26 cp conf/warden.conf /usr/local/etc/warden.conf 
    27 chmod 644 /usr/local/etc/warden.conf 
     35cp conf/warden.conf ${LB}/etc/warden.conf 
     36chmod 644 ${LB}/etc/warden.conf 
    2837 
    2938# Save the settings 
    3039if [ -n "$NIC" ] ; then 
    31    sed -i '' "s|$ONIC|NIC: $NIC|g" /usr/local/etc/warden.conf 
    32    sed -i '' "s|$OWTMP|WTMP: $WTMP|g" /usr/local/etc/warden.conf 
    33    sed -i '' "s|$OJDIR|JDIR: $JDIR|g" /usr/local/etc/warden.conf 
     40   sed -i '' "s|$ONIC|NIC: $NIC|g" ${LB}/etc/warden.conf 
     41   sed -i '' "s|$OWTMP|WTMP: $WTMP|g" ${LB}/etc/warden.conf 
     42   sed -i '' "s|$OJDIR|JDIR: $JDIR|g" ${LB}/etc/warden.conf 
    3443fi 
    3544 
     
    4756 
    4857# Setup rc.d 
    49 cp scripts/rc.d/wardenrc /usr/local/etc/rc.d/wardenrc 
    50 chmod 755 /usr/local/etc/rc.d/wardenrc 
     58cp scripts/rc.d/wardenrc ${LB}/etc/rc.d/wardenrc 
     59chmod 755 ${LB}/etc/rc.d/wardenrc 
    5160 
    5261cp agent.png ${PROGDIR}/ 
  • src-sh/xtrafiles/Makefile

    r1620346 rc60c604  
    22# Makefile for building: pc-extractoverlay 
    33############################################################################# 
     4 
     5PREFIX?= /usr/local 
    46 
    57####### Install 
     
    810 
    911install_doinstall: 
    10         sh install.sh 
     12        sh install.sh $(PREFIX) 
    1113 
    1214install:  install_doinstall 
  • src-sh/xtrafiles/install.sh

    r1620346 rc60c604  
    11#!/bin/sh 
    22 
     3DEFAULT="/usr/local" 
     4 
     5if [ -z "$1" ] ; then 
     6        LB="${DEFAULT}" 
     7else 
     8        LB="${1}" 
     9fi 
     10 
    311# Copy files to system 
    4 tar cvf - -C local . 2>/dev/null | tar xvf - -C /usr/local 
     12tar cvf - -C local . 2>/dev/null | tar xvf - -C ${LB} 
    513if [ $? -ne 0 ] ; then 
    614  exit 1 
Note: See TracChangeset for help on using the changeset viewer.