Changeset 1123729


Ignore:
Timestamp:
12/18/14 04:09:30 (2 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.1.1
Children:
ff50605
Parents:
126844c (diff), e1855fc (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 edited

Legend:

Unmodified
Added
Removed
  • mkports.sh

    r5b09297 re1855fc  
    2525 
    2626massage_subdir() { 
    27   echo "Adding SUBDIRS to $1" 
    2827  cd $1 
    2928  if [ $? -ne 0 ] ; then 
     
    3130     continue 
    3231  fi 
    33   comment="`cat Makefile | grep COMMENT`" 
    3432 
    3533  echo "# \$FreeBSD\$ 
     
    129127 
    130128done < mkports-list 
     129 
     130cd $ODIR 
     131 
     132# Add the files from build-files/ports-overlay 
     133for i in `find build-files/ports-overlay/ | grep Makefile` 
     134do 
     135 
     136  portMake=`echo $i | sed 's|build-files/ports-overlay/||g'` 
     137  port=`echo $portMake | sed 's|/Makefile||g'` 
     138  tcat=`echo $port | cut -d '/' -f 1` 
     139 
     140  echo "Adding port: $port" 
     141 
     142  # Copy the port now 
     143  if [ -e "${portsdir}/${port}" ] ; then 
     144     rm -rf ${portsdir}/${port} 
     145  fi 
     146  cp -r build-files/ports-overlay/${port} ${portsdir}/${port} 
     147 
     148  # Set the version number in these ports 
     149  mREV=`get_last_rev_git "./build-files/ports-overlay/$port"` 
     150  sed -i '' "s|CHGVERSION|$mREV|g" ${portsdir}/${portMake} 
     151 
     152  # Now make sure subdir Makefile is correct 
     153  massage_subdir "${portsdir}/$tcat" 
     154  cd $ODIR 
     155done 
  • src-qt5/libpcbsd/ui/kbsimpleoptionswidget.ui

    r3667cdb r126844c  
    8383       <widget class="QCheckBox" name="ktermXorg"> 
    8484        <property name="text"> 
    85          <string>Ctrl+Alt+Backspace trminates xorg</string> 
     85         <string>Ctrl+Alt+Backspace terminates xorg</string> 
    8686        </property> 
    8787       </widget> 
Note: See TracChangeset for help on using the changeset viewer.