Changeset 948


Ignore:
Timestamp:
Oct 5, 2002, 1:17:09 AM (18 years ago)
Author:
kevin
Message:

Change make.* options to build.* since they pertain to the build target, and
make isn't always the command that's used.

Location:
trunk
Files:
22 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/doc/portfile.7

    r738 r948  
    527527Execute necessary build commands
    528528.Bl -tag -width lc
    529 .It Ic make.cmd
     529.It Ic build.cmd
    530530Make command to run relative to ${worksrcdir}
    531531.br
     
    536536.br
    537537.Sy Example:
    538 .Dl make.cmd    pbxbuild
    539 
    540 .It Ic make.type
     538.Dl build.cmd   pbxbuild
     539
     540.It Ic build.type
    541541Type of make required, either 'gnu' or 'bsd'
    542 Sets make.cmd to either 'gnumake' or 'bsdmake' accordingly
     542Sets build.cmd to either 'gnumake' or 'bsdmake' accordingly
    543543.br
    544544.Sy Type:
     
    548548.br
    549549.Sy Example:
    550 .Dl make.type   gnu
    551 
    552 .It Ic make.pre_args
    553 Arguments to pass to ${make.cmd} before ${make.args}
    554 .br
    555 .Sy Type:
    556 .Em read-only
    557 .Sy Default:
    558 .Em ${make.target.current}
    559 
    560 
    561 .It Ic make.args
    562 Arguments to pass to ${make.cmd}
    563 .br
    564 .Sy Type:
    565 .Em optional
    566 .br
    567 .Sy Example:
    568 .Dl make.args   -DNOWARN
    569 
    570 
    571 .It Ic make.target.all
     550.Dl build.type  gnu
     551
     552.It Ic build.pre_args
     553Arguments to pass to ${build.cmd} before ${build.args}
     554.br
     555.Sy Type:
     556.Em read-only
     557.Sy Default:
     558.Em ${build.target.current}
     559
     560
     561.It Ic build.args
     562Arguments to pass to ${build.cmd}
     563.br
     564.Sy Type:
     565.Em optional
     566.br
     567.Sy Example:
     568.Dl build.args  -DNOWARN
     569
     570
     571.It Ic build.target.all
    572572Target to pass to make for building everything
    573573.br
     
    578578.br
    579579.Sy Example:
    580 .Dl make.target.all all-src
     580.Dl build.target.all all-src
    581581
    582582.El
     
    586586.Bl -tag -width lc
    587587
    588 .It Ic make.target.install
    589 Install target to pass to ${make.cmd}
     588.It Ic build.target.install
     589Install target to pass to ${build.cmd}
    590590.br
    591591.Sy Type:
     
    595595.br
    596596.Sy Example:
    597 .Dl make.target.install install-src
     597.Dl build.target.install        install-src
    598598
    599599.El
  • trunk/base/src/port1.0/portbuild.tcl

    r933 r948  
    3939
    4040# define options
    41 options make.target.all
    42 commands make
     41options build.target.all
     42commands build
    4343# defaults
    44 default make.dir {${workpath}/${worksrcdir}}
    45 default make.cmd {[build_getmaketype]}
    46 default make.pre_args {${make.target.current}}
    47 default make.target.all all
     44default build.dir {${workpath}/${worksrcdir}}
     45default build.cmd {[build_getmaketype]}
     46default build.pre_args {${build.target.current}}
     47default build.target.all all
    4848
    4949set UI_PREFIX "---> "
    5050
    5151proc build_getmaketype {args} {
    52     global make.type make.cmd os.name
     52    global build.type build.cmd os.name
    5353
    54     if ![info exists make.type] {
     54    if ![info exists build.type] {
    5555        return make
    5656    }
    57     switch -exact -- ${make.type} {
     57    switch -exact -- ${build.type} {
    5858        bsd {
    5959            if {${os.name} == "darwin"} {
     
    7474        }
    7575        default {
    76             ui_warning "Unknown make.type ${make.type}, using 'gnumake'"
     76            ui_warning "Unknown build.type ${build.type}, using 'gnumake'"
    7777            return gnumake
    7878        }
     
    8181
    8282proc build_main {args} {
    83     global portname portpath workdir prefix make.type make.cmd make.env make.target.all make.target.current UI_PREFIX worksrcdir
     83    global portname portpath workdir prefix build.type build.cmd build.env build.target.all build.target.current UI_PREFIX worksrcdir
    8484
    85     ui_msg "$UI_PREFIX Building $portname with target ${make.target.all}"
    86     set make.target.current ${make.target.all}
     85    ui_msg "$UI_PREFIX Building $portname with target ${build.target.all}"
     86    set build.target.current ${build.target.all}
    8787    system "[command make]"
    8888    return 0
  • trunk/base/src/port1.0/portinstall.tcl

    r821 r948  
    3939
    4040# define options
    41 options make.target.install
     41options build.target.install
    4242# Set defaults
    43 default make.target.install install
     43default build.target.current install
    4444
    4545set UI_PREFIX "---> "
    4646
    4747proc install_main {args} {
    48     global portname portversion portpath categories description depends_run contents pkg_install pkg_deinstall workdir worksrcdir prefix make.type make.cmd make.target.install UI_PREFIX make.target.current
     48    global portname portversion portpath categories description depends_run contents pkg_install pkg_deinstall workdir worksrcdir prefix build.type build.cmd build.target.install UI_PREFIX build.target.current
    4949
    5050    if ![file exists $prefix] {
     
    5555        }
    5656    }
    57     ui_msg "$UI_PREFIX Installing $portname with target ${make.target.install}"
    58     set make.target.current ${make.target.install}
     57    ui_msg "$UI_PREFIX Installing $portname with target ${build.target.install}"
     58    set build.target.current ${build.target.install}
    5959    if [catch {system "[command make]"}] {
    6060        ui_error "Installation failed."
  • trunk/dports/comms/scud/Portfile

    r935 r948  
    99patchfiles      patch-Makefile
    1010configure       {}
    11 make.type       bsd
    12 make.args       PREFIX=${prefix}
     11build.type      bsd
     12build.args      PREFIX=${prefix}
    1313
    1414contents        etc/rc.d/scud.sh.sample \
  • trunk/dports/databases/postgresql/Portfile

    r850 r948  
    1818post-patch      { reinplace "s|XXPREFIX|${prefix}|g" \
    1919                  "${workpath}/${worksrcdir}/src/Makefile.shlib" }
    20 make.type       gnu
     20build.type      gnu
    2121
    2222include contents
  • trunk/dports/games/nethack/Portfile

    r850 r948  
    1111patchfiles      patch-Makefile.top patch-Makefile.src
    1212worksrcdir      ${portname}-${portversion}
    13 make.target.install     manpages install
     13build.target.install    manpages install
    1414
    1515include contents
  • trunk/dports/graphics/gd/Portfile

    r889 r948  
    99patchfiles      patch-Makefile patch-gdcache.h
    1010depends_lib     lib:libpng:libpng lib:libjpeg:jpeg
    11 make.type       gnu
     11build.type      gnu
    1212configure       {}
    13 make.args       PREFIX=${prefix}
     13build.args      PREFIX=${prefix}
    1414post-install    { system "ranlib ${prefix}/lib/libgd.a" }
    1515 
  • trunk/dports/irc/epic/Portfile

    r854 r948  
    1111distname        ${portname}4-${portversion}
    1212checksums       md5 53610020128ba1edb7701a73b778f75f
    13 make.env        LOGNAME=${env(USER)}
     13build.env       LOGNAME=${env(USER)}
    1414patchfiles      patch-Makefile.in
    1515
  • trunk/dports/irc/shadowirc/Portfile

    r811 r948  
    1313configure       {}
    1414
    15 make.type       pbx
    16 make.target.all ""
    17 make.args       -buildstyle Deployment
    18 make.target.install install DSTROOT=/
     15build.type      pbx
     16build.target.all ""
     17build.args      -buildstyle Deployment
     18build.target.install install DSTROOT=/
    1919
    2020# Work around bug in plugins code
  • trunk/dports/lang/nqc/Portfile

    r864 r948  
    1313configure       {}
    1414
    15 make.env        TARGET=macosx
     15build.env       TARGET=macosx
    1616contents        bin/mkdata \
    1717                bin/nqc \
  • trunk/dports/mail/ssmtp/Portfile

    r850 r948  
    1212worksrcdir      ${portname}-${portversion}
    1313patchfiles      patch-net.c patch-generate_config
    14 make.type       gnu
     14build.type      gnu
    1515
    1616contents        etc/ssmtp/revaliases \
  • trunk/dports/net/libfetch/Portfile

    r870 r948  
    88checksums       md5 b99c647fb16c108ee40b62e18e1d2e4a
    99patchfiles      patch-Makefile patch-http.c
    10 make.type       bsd
     10build.type      bsd
    1111worksrcdir      ${portname}
    1212configure       {}
    1313set libver      3
    14 make.env        LDADD=-install_name\\ ${prefix}/lib/libfetch.${libver}.dylib
     14build.env       LDADD=-install_name\\ ${prefix}/lib/libfetch.${libver}.dylib
    1515install         { cd ${workpath}/${worksrcdir}
    1616                  system "install -o root -m 755 -d ${prefix}/lib"
  • trunk/dports/net/netcat/Portfile

    r850 r948  
    1616                  system "tar xfz ${distpath}/${distfiles}" }
    1717configure       {}
    18 make.target.all next
     18build.target.all        next
    1919patchfiles      patch-Makefile
    2020install         { cd ${workpath}/${worksrcdir}
  • trunk/dports/print/teTeX/Portfile

    r786 r948  
    5252              system "tar xfz ${distpath}/${tetex_texmf}" }
    5353
    54 make.target.install     install strip
     54build.target.install    install strip
    5555
    5656depends_lib     lib:libpng.3:libpng lib:libwwwcore.0:libwww
  • trunk/dports/textproc/dict/Portfile

    r850 r948  
    1111configure.type          gnu
    1212configure.args          --without-local-zlib --with-etcdir=${prefix}/etc
    13 make.type               gnu
    14 make.target.all         dict
    15 make.target.install     install.dict
     13build.type              gnu
     14build.target.all                dict
     15build.target.install    install.dict
    1616contents                bin/dict \
    1717                        man/man1/dict.1
  • trunk/dports/textproc/figlet/Portfile

    r850 r948  
    1313configure               {}
    1414
    15 make.env                PREFIX=$prefix
     15build.env               PREFIX=$prefix
    1616
    1717# Yes, we want contents of share/figlet to be included
  • trunk/dports/textproc/ispell/Portfile

    r850 r948  
    77master_sites            http://fmg-www.cs.ucla.edu/geoff/tars/
    88checksums               md5 d434e1aef1a815294d5012c60c4c414a
    9 make.env                TMPDIR=${workpath}
     9build.env               TMPDIR=${workpath}
    1010configure {
    1111                        cd ${workpath}/${worksrcdir}
  • trunk/dports/textproc/openjade/Portfile

    r850 r948  
    1111configure.type          gnu
    1212configure.args          --prefix=$prefix CXXFLAGS=-fno-rtti
    13 make.type                       gnu
    14 make.target.install     install install-man
     13build.type                      gnu
     14build.target.install    install install-man
    1515
    1616contents                bin/onsgmls bin/openjade bin/osgmlnorm bin/ospam bin/ospent bin/osx \
  • trunk/dports/x11/XFree86/Portfile

    r875 r948  
    1010configure       {}
    1111worksrcdir      xc
    12 make.target.all World
     12build.target.all        World
    1313
    1414if {[regexp ^6\. ${os.version} match] == 1} {
  • trunk/dports/x11/gtk/Portfile

    r854 r948  
    2121
    2222configure.args  --with-glib-prefix=${prefix}
    23 make.args       CFLAGS+=-I/usr/X11R6/include
     23build.args      CFLAGS+=-I/usr/X11R6/include
    2424patchfiles      patch-config.guess patch-config.sub
    2525
  • trunk/www/en/portfileHOWTO.php

    r917 r948  
    33//
    44// File     : portfileHOWTO.php
    5 // Version  : $Id: portfileHOWTO.php,v 1.4 2002/10/04 04:13:24 landonf Exp $
     5// Version  : $Id: portfileHOWTO.php,v 1.5 2002/10/05 01:14:22 kevin Exp $
    66// Location : /projects/darwinports/portfileHOWTO.php
    77//
     
    166166</tt></pre>
    167167<p>
    168 By default, the build phase executes the makefile using GNU make.  (This can be changed with the <tt>make.type</tt> option.)  The above step has starting compiling the sources, when it finishes we'll be ready to install the software. 
     168By default, the build phase executes the system's make(1) utility.  (This can be changed with the <tt>build.type</tt> option which accepts an argument of <tt>bsd</tt>, <tt>gnu</tt>, or <tt>pbx</tt>.  Alternatively, the <tt>build.cmd</tt> option may be used to specify an arbitrary build command.)  The above step has starting compiling the sources, when it finishes we'll be ready to install the software. 
    169169</p>
    170170
  • trunk/www/portfileHOWTO.php

    r917 r948  
    33//
    44// File     : portfileHOWTO.php
    5 // Version  : $Id: portfileHOWTO.php,v 1.4 2002/10/04 04:13:24 landonf Exp $
     5// Version  : $Id: portfileHOWTO.php,v 1.5 2002/10/05 01:14:22 kevin Exp $
    66// Location : /projects/darwinports/portfileHOWTO.php
    77//
     
    166166</tt></pre>
    167167<p>
    168 By default, the build phase executes the makefile using GNU make.  (This can be changed with the <tt>make.type</tt> option.)  The above step has starting compiling the sources, when it finishes we'll be ready to install the software. 
     168By default, the build phase executes the system's make(1) utility.  (This can be changed with the <tt>build.type</tt> option which accepts an argument of <tt>bsd</tt>, <tt>gnu</tt>, or <tt>pbx</tt>.  Alternatively, the <tt>build.cmd</tt> option may be used to specify an arbitrary build command.)  The above step has starting compiling the sources, when it finishes we'll be ready to install the software. 
    169169</p>
    170170
Note: See TracChangeset for help on using the changeset viewer.