Changeset e86d9c0


Ignore:
Timestamp:
10/21/13 12:01:02 (10 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
f13911d
Parents:
81e8276 (diff), 53badd9 (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:
27 deleted
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • build-files/conf/port-make.conf

    r81e8276 re86d9c0  
    1212WITH_PLASMA_RUBY=yes 
    1313WITH_VDPAU=yes 
     14WITH_GALLIUM=YES 
    1415 
    1516#Openoffice Language Options 
  • src-sh/pbi-manager10/pbi-manager

    r7e02eb1a r5aee13d  
    36733673 
    36743674        if [ "`basename $0`" = "pbi_makeport" -o "`basename $0`" = "pbi_makeport_chroot" ] ; then 
    3675           #PBI_STAGEDIR="/usr/local" 
    3676           # KPM REMOVE ME 
    36773675          mk_stage_dir "/usr/local" "move" 
    36783676 
     
    37143712        echo "Creating hash list..." 
    37153713 
    3716         hashfile="${PBI_STAGEDIR}/${PBI_HASHLIST}" 
     3714        hashfile="${PBI_STAGEDIRMNT}/${PBI_HASHLIST}" 
    37173715 
    37183716        if [ -e "${hashfile}" ] ; then rm "${hashfile}" ; fi 
     
    39593957        _dFound=0 
    39603958 
    3961         dir="${PBI_STAGEDIR}/${PBI_APPDESK_DIR}" 
     3959        dir="${PBI_STAGEDIRMNT}/${PBI_APPDESK_DIR}" 
    39623960        if [ ! -d "${dir}" ] ; then mkdir -p "${dir}" ; fi 
    39633961        echo "#!/bin/sh" >"${dir}/${PBI_INS_DESKSCRIPT}" 
     
    40034001        _mFound=0 
    40044002 
    4005         dir="${PBI_STAGEDIR}/${PBI_APPMENU_DIR}" 
     4003        dir="${PBI_STAGEDIRMNT}/${PBI_APPMENU_DIR}" 
    40064004        if [ ! -d "${dir}" ] ; then mkdir -p "${dir}" ; fi 
    40074005        echo "#!/bin/sh" >"${dir}/${PBI_INS_MENUSCRIPT}" 
     
    40584056        _mFound=0 
    40594057 
    4060         dir="${PBI_STAGEDIR}/${PBI_APPMIME_DIR}" 
     4058        dir="${PBI_STAGEDIRMNT}/${PBI_APPMIME_DIR}" 
    40614059        if [ ! -d "${dir}" ] ; then mkdir -p "${dir}" ; fi 
    40624060        echo "#!/bin/sh" >"${dir}/${PBI_INS_MIMESCRIPT}" 
     
    41214119 
    41224120        # Look for any XDG scripts 
    4123         if [ -e "${PBI_STAGEDIR}/${PBI_APPMIME_DIR}/${PBI_INS_MIMESCRIPT}" ] ; then 
     4121        if [ -e "${PBI_STAGEDIRMNT}/${PBI_APPMIME_DIR}/${PBI_INS_MIMESCRIPT}" ] ; then 
    41244122                echo "$PBI_PROGDIRPATH/${PBI_APPMIME_DIR}/${PBI_INS_MIMESCRIPT}" >>${insc} 
    41254123        fi 
    4126         if [ -e "${PBI_STAGEDIR}/${PBI_APPMENU_DIR}/${PBI_INS_MENUSCRIPT}" ] ; then 
     4124        if [ -e "${PBI_STAGEDIRMNT}/${PBI_APPMENU_DIR}/${PBI_INS_MENUSCRIPT}" ] ; then 
    41274125                echo "$PBI_PROGDIRPATH/${PBI_APPMENU_DIR}/${PBI_INS_MENUSCRIPT}" >>${insc} 
    41284126        fi 
     
    41494147 
    41504148        # Look for any XDG scripts 
    4151         if [ -e "${PBI_STAGEDIR}/${PBI_APPMIME_DIR}/${PBI_UNINS_MIMESCRIPT}" ] ; then 
     4149        if [ -e "${PBI_STAGEDIRMNT}/${PBI_APPMIME_DIR}/${PBI_UNINS_MIMESCRIPT}" ] ; then 
    41524150                echo "$PBI_PROGDIRPATH/${PBI_APPMIME_DIR}/${PBI_UNINS_MIMESCRIPT}" >>${uisc} 
    41534151        fi 
    4154         if [ -e "${PBI_STAGEDIR}/${PBI_APPMENU_DIR}/${PBI_UNINS_MENUSCRIPT}" ] ; then 
     4152        if [ -e "${PBI_STAGEDIRMNT}/${PBI_APPMENU_DIR}/${PBI_UNINS_MENUSCRIPT}" ] ; then 
    41554153                echo "$PBI_PROGDIRPATH/${PBI_APPMENU_DIR}/${PBI_UNINS_MENUSCRIPT}" >>${uisc} 
    41564154        fi 
  • src-sh/pbi-manager10/pbime/pbimount

    r857bc75 r249fcd7  
    109109check_pbidir "${2}" 
    110110mount_dirs "${2}" 
     111mount_dirs "${2}" 
Note: See TracChangeset for help on using the changeset viewer.