Changeset d9cad7c


Ignore:
Timestamp:
04/27/13 09:44:43 (16 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.1-release, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
ef01e23
Parents:
84b1299
Message:

Change location of .pbiwrapper-$ARCH file

Fix pkg-plist

Location:
src-sh
Files:
3 edited

Legend:

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

    r84b1299 rd9cad7c  
    103103  chown root:wheel /usr/pbi/.pbiwrapper  
    104104  chmod 644 /usr/pbi/.pbiwrapper 
    105   cp /usr/pbi/.pbiwrapper ${LB}/share/pbi-manager/.pbi-wrapper-i386 
    106   mv /usr/pbi/.pbiwrapper /usr/pbi/.pbiwrapper-i386 
     105  mv /usr/pbi/.pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-i386 
    107106else 
    108   touch ${LB}/share/pbi-manager/.pbi-wrapper-i386 
     107  touch ${LB}/share/pbi-manager/.pbiwrapper-i386 
    109108fi 
    110109 
     
    119118chown root:wheel /usr/pbi/.pbiwrapper  
    120119chmod 644 /usr/pbi/.pbiwrapper 
    121 cp /usr/pbi/.pbiwrapper ${LB}/share/pbi-manager/.pbi-wrapper-`uname -m` 
    122 mv /usr/pbi/.pbiwrapper /usr/pbi/.pbiwrapper-`uname -m` 
     120mv /usr/pbi/.pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-`uname -m` 
  • src-sh/pbi-manager/pbi-manager

    r1620346 rd9cad7c  
    13171317        PROGBASE=/usr/local 
    13181318        SYS_LOCALBASE=/usr/local 
     1319        PBI_SHARE_DIR="${PROGBASE}/share/pbi-manager" 
    13191320        if [ -z "${PBI_APPDIR}" -o "`basename $0`" = "pbi_makeport_chroot" ] ; then 
    13201321                PBI_APPDIR="/usr/pbi" 
     
    37553756 
    37563757        # Copy the wrapper binary 
    3757         PBI_WRAPPERFILE="${PBI_APPDIR}/.pbiwrapper-$ARCH" 
     3758        PBI_WRAPPERFILE="${PBI_SHARE_DIR}/.pbiwrapper-$ARCH" 
    37583759        cp ${PBI_WRAPPERFILE} ${dir}/${fbin} 
    37593760        chmod 755 ${dir}/${fbin} 
     
    68296830 
    68306831        # Copy our binary wrapper 
    6831         PBI_WRAPPERFILE="${PBI_APPDIR}/.pbiwrapper-$ARCH" 
    6832         mkdir ${PBI_CHROOTDIR}${PBI_APPDIR} 2>/dev/null 
     6832        PBI_WRAPPERFILE="${PBI_SHARE_DIR}/.pbiwrapper-$ARCH" 
     6833        mkdir ${PBI_CHROOTDIR}${PBI_SHARE_DIR} 2>/dev/null 
    68336834        cp ${PBI_WRAPPERFILE} ${PBI_CHROOTDIR}${PBI_WRAPPERFILE} 
    68346835 
  • src-sh/port-files/pkg-plist

    r84b1299 rd9cad7c  
    546546etc/pbi.conf 
    547547etc/rc.d/pbid 
    548 share/pbi-manager/.pbi-wrapper-i386 
    549 share/pbi-manager/.pbi-wrapper-amd64 
     548share/pbi-manager/.pbiwrapper-i386 
     549share/pbi-manager/.pbiwrapper-amd64 
    550550share/pbi-manager/module-examples/gimp/xdg-menu/gimp.desktop 
    551551share/pbi-manager/module-examples/gimp/xdg-mime/gimp-xdg.png 
     
    704704@dirrm share/pcbsd/distfiles 
    705705@dirrm share/pcbsd 
    706 @unexec rm /usr/pbi/.pbiwrapper-amd64 >/dev/null 2>/dev/null 
    707 @unexec rm /usr/pbi/.pbiwrapper-i386 >/dev/null 2>/dev/null 
    708706@unexec rmdir /usr/pbi/.hashdir >/dev/null 2>/dev/null 
    709707@unexec rmdir /usr/pbi/share/applications >/dev/null 2>/dev/null 
Note: See TracChangeset for help on using the changeset viewer.