Changeset b64e501


Ignore:
Timestamp:
Sep 18, 2013 9:19:41 AM (7 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
77c0221
Parents:
e9760d0 (diff), 52c32d9 (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:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pbi-manager10/pbi-manager

    r6808980 r52c32d9  
    15741574                if [ -n "${PBI_PROGVERSION}" ] ; then return 0 ; fi 
    15751575        else 
     1576                # Check first if we have this pkg in PKGNG 
     1577                if [ -e "/usr/local/sbin/pkg-static" ] ; then 
     1578                        local testPkgVer="`pkg info -O ${PBI_MAKEPORT} | awk '{print $1}' | rev | cut -d '-' -f 1 | rev`" 
     1579                        if [ -n "$testPkgVer" ] ; then 
     1580                                export PBI_PROGVERSION="$testPkgVer" 
     1581                                return 0 
     1582                        fi 
     1583                fi 
     1584 
    15761585                return 0 
    15771586        fi 
    15781587 
     1588        # Get the version from ports 
    15791589        if [ -z "${PBI_PROGVERSION}" -a -n "${PORTSDIR}" -a -n "${PBI_MAKEPORT}" ] ; then 
    15801590                PORTVER="`make -C ${PORTSDIR}/${PBI_MAKEPORT} -V DISTVERSION PORTSDIR=${PORTSDIR} 2>/dev/null`" 
     
    49294939start_pbi_makeport() 
    49304940{ 
    4931         do_port_build "/usr/ports/${PBI_MAKEPORT}" 
     4941        do_port_build "${PBI_MAKEPORT}" 
    49324942} 
    49334943 
     
    49394949        local iFile="$PORTSDIR/INDEX-$FBSDMAJOR" 
    49404950 
    4941         get_pkgname "${PORTSDIR}/${PBI_MAKEPORT}" 
     4951        get_pkgname "${PBI_MAKEPORT}" 
    49424952        echo "${PKGNAME}" > /.keepports 
    49434953        grep "^${PKGNAME}|" $iFile | cut -d '|' -f 9 | tr ' ' '\n' >>/.keepports 
     
    49474957        do 
    49484958                if [ ! -d "${PORTSDIR}/${port}" ] ; then continue ; fi 
    4949                 get_pkgname "${PORTSDIR}/${port}" 
     4959                get_pkgname "${port}" 
    49504960                echo "${PKGNAME}" >> /.keepports 
    49514961                grep "^${PKGNAME}|" $iFile | cut -d '|' -f 9 | tr ' ' '\n' >>/.keepports 
     
    49554965        do 
    49564966                if [ ! -d "${PORTSDIR}/${port}" ] ; then continue ; fi 
    4957                 get_pkgname "${PORTSDIR}/${port}" 
     4967                get_pkgname "${port}" 
    49584968                echo "${PKGNAME}" >> /.keepports 
    49594969                grep "^${PKGNAME}|" $iFile | cut -d '|' -f 9 | tr ' ' '\n' >>/.keepports 
     
    49804990# Get the full package-name for a target port 
    49814991get_pkgname() { 
    4982         name="`make -C ${1} -V PKGNAME PORTSDIR=${PORTSDIR}`" 
     4992        name="`pkg info -O ${1} | awk '{print $1}'`" 
    49834993        PKGNAME="${name}" 
    49844994} 
     
    49945004                        exit_err "/usr/ports/${port} does not exist!" 
    49955005                fi 
    4996                 do_port_build "/usr/ports/${port}" 
     5006                do_port_build "${port}" 
    49975007        done 
    49985008 
     
    50095019                        exit_err "/usr/ports/${port} does not exist!" 
    50105020                fi 
    5011                 do_port_build "/usr/ports/${port}" 
     5021                do_port_build "${port}" 
    50125022        done 
    50135023 
     
    66836693        start_postbuild_script 
    66846694        start_pbi_mkportafter 
     6695 
     6696        # Get the version again, in case we installed from pkgng and it doesn't match ports 
     6697        get_pbi_progversion 
    66856698 
    66866699        # Prune any proto / build specific ports 
     
    71927205mk_auto_ext_linksfile() { 
    71937206        # Get ports name 
    7194         get_pkgname "${PORTSDIR}/${PBI_MAKEPORT}" 
     7207        get_pkgname "${PBI_MAKEPORT}" 
    71957208        _pname="${PKGNAME}" 
    71967209 
    7197         # Define some commands 
    7198         pkgInf="pkg info -l" 
    7199  
    7200         ${pkgInf} ${_pname} | sed "s|^${PBI_PROGDIRPATH}/||g" \ 
     7210        pkg info -l ${_pname} | sed "s|^${PBI_PROGDIRPATH}/||g" \ 
    72017211                | grep -v -e "^Information for" -e "^Files:" -e "owns the following" \ 
    72027212                | tr -s '\t' ' ' \ 
     
    73217331do_port_build() 
    73227332{ 
    7323   local _lPort="$1" 
     7333  local _lPortRaw="$1" 
     7334  local _lPort="/usr/ports/$1" 
    73247335 
    73257336  local iFile="$PORTSDIR/INDEX-$FBSDMAJOR" 
     
    73637374  # Are we doing a PKGNG build? 
    73647375  if [ "$PBI_PKGNGBUILD" ] ; then 
    7365         pkg install -y "$_lPort"         
     7376        pkg install -y "$_lPortRaw" 
    73667377        if [ $? -ne 0 ] ; then 
    7367            exit_err "Failed installing $_lPort" 
     7378           exit_err "Failed installing $_lPortRaw" 
    73687379        fi 
    73697380        return 0 
  • src-qt4/life-preserver/LPTray.cpp

    r04144d6 re9760d0  
    33//PUBLIC 
    44LPTray::LPTray() : QSystemTrayIcon(){ 
    5   //initPhase = true; //flag that we are in the startup process 
    65  //Start up the log file watcher and connect the signals/slots 
    76  watcher = new LPWatcher(); 
  • src-qt4/life-preserver/LPTray.h

    r220bbd4 re9760d0  
    44#include <QSystemTrayIcon> 
    55#include <QMenu> 
    6 //#include <QFileSystemWatcher> 
    76#include <QString> 
    8 //#include <QTimer> 
    9 //#include <QProcess> 
    10 //#include <QFile> 
    11 //#include <QTextStream> 
    127#include <QMessageBox> 
    138 
     
    2520        QMenu *menu; 
    2621        mainUI *GUI; 
    27         //bool initPhase; 
    2822 
    2923 
Note: See TracChangeset for help on using the changeset viewer.