Changeset c405e82


Ignore:
Timestamp:
Oct 9, 2013 9:23:40 AM (6 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
0d4cf8f
Parents:
3b7aa60
Message:

Link pbi-manager10 into the build, fix ports pkg-plist if installing
to 10.x or higher

Location:
src-sh
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • src-sh/Makefile

    rc60c604 rc405e82  
    3636                sub-pcfirst \ 
    3737                sub-pbi \ 
     38                sub-pbi10 \ 
    3839                sub-deinfo \ 
    3940                sub-meta \ 
     
    263264        cd pbi-manager/ && $(MAKE) -f $(MAKEFILE) install 
    264265 
     266sub-pbi10: pbi-manager10/$(MAKEFILE) FORCE 
     267        cd pbi-manager10/ && $(MAKE) -f $(MAKEFILE) 
     268sub-pbi10-make_default: pbi-manager10/$(MAKEFILE) FORCE 
     269        cd pbi-manager10/ && $(MAKE) -f $(MAKEFILE)  
     270sub-pbi10-make_first: pbi-manager10/$(MAKEFILE) FORCE 
     271        cd pbi-manager10/ && $(MAKE) -f $(MAKEFILE) first 
     272sub-pbi10-all: pbi-manager10/$(MAKEFILE) FORCE 
     273        cd pbi-manager10/ && $(MAKE) -f $(MAKEFILE) all 
     274sub-pbi10-clean: pbi-manager10/$(MAKEFILE) FORCE 
     275        cd pbi-manager10/ && $(MAKE) -f $(MAKEFILE) clean 
     276sub-pbi10-install_subtargets: pbi-manager10/$(MAKEFILE) FORCE 
     277        cd pbi-manager10/ && $(MAKE) -f $(MAKEFILE) install 
     278 
    265279sub-meta: pc-metapkgmanager/$(MAKEFILE) FORCE 
    266280        cd pc-metapkgmanager/ && $(MAKE) -f $(MAKEFILE) 
     
    305319        sub-lpreserver-make_default \ 
    306320        sub-pbi-make_default \ 
     321        sub-pbi10-make_default \ 
    307322        sub-about-make_default \ 
    308323        sub-meta-make_default \ 
     
    327342        sub-lpreserver-make_first \ 
    328343        sub-pbi-make_first \ 
     344        sub-pbi10-make_first \ 
    329345        sub-about-make_first \ 
    330346        sub-meta-make_first \ 
     
    349365        sub-lpreserver-all \ 
    350366        sub-pbi-all \ 
     367        sub-pbi10-all \ 
    351368        sub-about-all \ 
    352369        sub-meta-all \ 
     
    369386 
    370387clean: sub-pbi-clean \ 
     388        sub-pbi10-clean \ 
    371389        sub-libsh-clean \ 
    372390        sub-lpreserver-clean \ 
     
    392410install_subtargets: sub-libsh-install_subtargets \ 
    393411        sub-pbi-install_subtargets \ 
     412        sub-pbi10-install_subtargets \ 
    394413        sub-lpreserver-install_subtargets \ 
    395414        sub-about-install_subtargets \ 
  • src-sh/pbi-manager/install.sh

    r0e66326 rc405e82  
    33 
    44# Check if this is for the right version of FreeBSD 
    5 #verCheck="`grep '^#define __FreeBSD_version' /usr/include/sys/param.h | awk '{print $3}'`" 
    6 #if [ $verCheck -gt 1000000 ] ; then 
    7 #  # This version is for FreeBSD <= 10 
    8 #  exit 0 
    9 #fi 
     5verCheck="`grep '^#define __FreeBSD_version' /usr/include/sys/param.h | awk '{print $3}'`" 
     6if [ $verCheck -gt 1000000 ] ; then 
     7  # This version is for FreeBSD <= 10 
     8  exit 0 
     9fi 
    1010 
    1111DEFAULT="/usr/local" 
  • src-sh/pbi-manager10/install.sh

    r44335dc rc405e82  
    66if [ $verCheck -lt 1000000 ] ; then 
    77  # This version is for FreeBSD >= 10 
    8   #exit 0 
     8  exit 0 
    99fi 
    1010 
     
    111111  mv pbiwrapper ${LB}/share/pbi-manager/.pbiwrapper-i386 
    112112else 
    113   touch ${LB}/share/pbi-manager/.pbiwrapper-i386 
     113  touch ${LB}/share/pbi-manager/.pbiwrapper-amd64 
    114114fi 
    115115 
     
    127127 
    128128# Install the pbime wrapper 
    129 cd ${DIR}/pbime && make install 
     129cd ${DIR}/pbime && make 
     130install -o root -g wheel -m 4751 pbime ${LB}/share/pbi-manager/.pbime 
     131install -o root -g wheel -m 755 pbimount ${LB}/share/pbi-manager/.pbimount 
     132if [ "${LB}" = "/usr/local" ] ; then 
     133  install -o root -g wheel -m 4751 pbime /usr/pbi/.pbime 
     134  install -o root -g wheel -m 755 pbimount /usr/pbi/.pbimount 
     135fi 
    130136 
    131137# Install the nullfs binary 
    132 cd ${DIR}/mount_nullfs && make install 
     138cd ${DIR}/mount_nullfs && make  
     139install -o root -g wheel -m 755 mount_nullfs ${LB}/share/pbi-manager/.mount_nullfs 
     140if [ "${LB}" = "/usr/local" ] ; then 
     141  install -o root -g wheel -m 755 mount_nullfs /usr/pbi/.mount_nullfs 
     142fi 
    133143 
    134144# Install the MANPATH conf 
  • src-sh/port-files/Makefile

    r0535dca0 rc405e82  
    3434.endif 
    3535 
     36.if ${OSVERSION} > 1000000 
     37PLIST_FILES+=   share/pbi-manager/.pbime \ 
     38                share/pbi-manager/.pbimount \ 
     39                share/pbi-manager/.mount_nullfs \ 
     40                etc/man.d/pbi.conf 
     41.endif 
     42 
    3643do-install: 
    3744        cd ${WRKSRC} && make install PREFIX=${STAGEDIR}${PREFIX} 
  • src-sh/port-files/pkg-install

    rc60c604 rc405e82  
    2828fi 
    2929 
     30# If on FreeBSD > 10, install the PBI mounting files 
     31if [ -e "${PREFIX}/share/pbi-manager/.pbime" ] ; then 
     32   install -o root -g wheel -m 4751 ${PREFIX}/share/pbi-manager/.pbime /usr/pbi/.pbime 
     33   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/.mount_nullfs /usr/pbi/.mount_nullfs 
     35fi 
     36 
    3037exit 0 
Note: See TracChangeset for help on using the changeset viewer.