Changeset 387a9a6


Ignore:
Timestamp:
10/21/13 09:48:54 (9 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
4f9718b, d9190b1
Parents:
dc2b143 (diff), 857bc75 (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:
1 added
13 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pbi-manager10/install.sh

    rc405e82 r9b2c4e1  
    130130install -o root -g wheel -m 4751 pbime ${LB}/share/pbi-manager/.pbime 
    131131install -o root -g wheel -m 755 pbimount ${LB}/share/pbi-manager/.pbimount 
     132install -o root -g wheel -m 755 ldconfig ${LB}/share/pbi-manager/.ldconfig 
    132133if [ "${LB}" = "/usr/local" ] ; then 
    133134  install -o root -g wheel -m 4751 pbime /usr/pbi/.pbime 
    134135  install -o root -g wheel -m 755 pbimount /usr/pbi/.pbimount 
     136  install -o root -g wheel -m 755 ldconfig /usr/pbi/.ldconfig 
    135137fi 
    136138 
  • src-sh/pbi-manager10/pbi-manager

    rc65ccb6 r7e02eb1a  
    16301630get_pbi_progversion() { 
    16311631 
    1632         if [ -z "${PBI_PROGVERSION}" ] ; then 
    1633                 load_pbi_conffile 
    1634  
    1635                 # If we have PBI_PROGVERSION now set 
    1636                 if [ -n "${PBI_PROGVERSION}" ] ; then return 0 ; fi 
    1637         else 
    1638                 return 0 
    1639         fi 
     1632        if [ -n "${PBI_PROGVERSION}" ] ; then return 0 ; fi 
     1633 
     1634        load_pbi_conffile 
     1635 
     1636        # If we have PBI_PROGVERSION now set 
     1637        if [ -n "${PBI_PROGVERSION}" ] ; then return 0 ; fi 
    16401638 
    16411639        # Check first if we have this pkg in PKGNG 
  • src-sh/pbi-manager10/pbime/Makefile

    r94b18f3 r9b2c4e1  
    88        install -o root -g wheel -m 4751 pbime /usr/pbi/.pbime 
    99        install -o root -g wheel -m 755 pbimount /usr/pbi/.pbimount 
     10        install -o root -g wheel -m 755 ldconfig /usr/pbi/.ldconfig 
  • src-sh/pbi-manager10/pbime/pbimount

    r8a3e12a r857bc75  
    6363   done 
    6464 
    65    chroot ${pDir}/virtbase /etc/rc.d/ldconfig start >/dev/null 2>/dev/null 
     65   cp /usr/pbi/.ldconfig ${pDir}/virtbase/var/run/ldconfig 
     66   chroot ${pDir}/virtbase /var/run/ldconfig start >/dev/null 2>/dev/null 
    6667} 
    6768 
  • src-sh/port-files/Makefile

    r7d497d1 r9b2c4e1  
    3636PLIST_FILES+=   share/pbi-manager/.pbime \ 
    3737                share/pbi-manager/.pbimount \ 
     38                share/pbi-manager/.ldconfig \ 
    3839                share/pbi-manager/.mount_nullfs \ 
    3940                etc/man.d/pbi.conf 
  • src-sh/port-files/pkg-install

    rc405e82 r9b2c4e1  
    3232   install -o root -g wheel -m 4751 ${PREFIX}/share/pbi-manager/.pbime /usr/pbi/.pbime 
    3333   install -o root -g wheel -m 755 ${PREFIX}/share/pbi-manager/.pbimount /usr/pbi/.pbimount 
     34   install -o root -g wheel -m 755 ${PREFIX}/share/pbi-manager/.ldconfig /usr/pbi/.ldconfig 
    3435   install -o root -g wheel -m 755 ${PREFIX}/share/pbi-manager/.mount_nullfs /usr/pbi/.mount_nullfs 
    3536fi 
  • src-qt4/port-files/pkg-plist

    r4bf853e rdc2b143  
    33bin/about-gui 
    44bin/life-preserver 
     5bin/life-preserver-tray 
    56bin/pc-adsldap 
    67bin/pc-bluetoothmanager 
Note: See TracChangeset for help on using the changeset viewer.