Ignore:
Timestamp:
Apr 9, 2013, 6:46:31 PM (7 years ago)
Author:
snc@…
Message:

merge from trunk

Location:
branches/gsoc11-statistics/base
Files:
7 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/gsoc11-statistics/base

  • branches/gsoc11-statistics/base/doc/Makefile

    r79672 r105085  
    22MAN5=           macports.conf.5
    33MAN7=           portfile.7 portstyle.7 porthier.7 portgroup.7
    4 CONF=       macports.conf pubkeys.conf sources.conf variants.conf
     4CONF=       archive_sites.conf macports.conf pubkeys.conf sources.conf variants.conf
    55INSTALLDIR=     ${DESTDIR}${prefix}
    66TOPSRCDIR=      ..
     
    3030
    3131install: all
    32         $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
    33         $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${mpconfigdir}
     32        $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "${INSTALLDIR}"
     33        $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "${DESTDIR}${mpconfigdir}"
    3434
    35         < prefix.mtree $(MTREE) -U -e -p ${INSTALLDIR} > /dev/null
    36         < base.mtree $(MTREE) -U -e -p ${INSTALLDIR} > /dev/null
    37         if test -L "${INSTALLDIR}/man" ; then \
    38                 rm -f "${INSTALLDIR}/man"; \
    39         fi
    40 
    41         if test ! -e "${INSTALLDIR}/man" ; then \
    42                 $(LN_S) share/man ${INSTALLDIR}/man; \
    43         fi
     35        < prefix.mtree $(MTREE) -U -e -p "${INSTALLDIR}" > /dev/null
     36        < base.mtree $(MTREE) -U -e -p "${INSTALLDIR}" > /dev/null
    4437
    4538        for f in ${CONF}; do \
    46                 $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$f ${DESTDIR}${mpconfigdir}/$${f}.default; \
    47                 if test ! -e ${DESTDIR}${mpconfigdir}/$$f ; then \
     39                $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$f "${DESTDIR}${mpconfigdir}/$${f}.default"; \
     40                if test ! -e "${DESTDIR}${mpconfigdir}/$$f" ; then \
    4841                        set -x; \
    49                         $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 $$f ${DESTDIR}${mpconfigdir}; \
     42                        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 $$f "${DESTDIR}${mpconfigdir}"; \
    5043                fi; \
    5144        done
    5245
    5346        # delete old uncompressed man pages if they exist
    54         for m in ${MAN1}; do rm -f ${INSTALLDIR}/share/man/man1/$$m ; done
    55         for m in ${MAN5}; do rm -f ${INSTALLDIR}/share/man/man5/$$m ; done
    56         for m in ${MAN7}; do rm -f ${INSTALLDIR}/share/man/man7/$$m ; done
     47        for m in ${MAN1}; do rm -f "${INSTALLDIR}/share/man/man1/$$m" ; done
     48        for m in ${MAN5}; do rm -f "${INSTALLDIR}/share/man/man5/$$m" ; done
     49        for m in ${MAN7}; do rm -f "${INSTALLDIR}/share/man/man7/$$m" ; done
    5750
    58         $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}/share/macports/install
    59         $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 base.mtree ${INSTALLDIR}/share/macports/install/
    60         $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 prefix.mtree ${INSTALLDIR}/share/macports/install/
    61         $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 macosx.mtree ${INSTALLDIR}/share/macports/install/
    62         $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 port.1.gz ${INSTALLDIR}/share/man/man1
    63         $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 macports.conf.5.gz ${INSTALLDIR}/share/man/man5
    64         $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 portfile.7.gz ${INSTALLDIR}/share/man/man7
    65         $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 portstyle.7.gz ${INSTALLDIR}/share/man/man7
    66         $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 porthier.7.gz ${INSTALLDIR}/share/man/man7
    67         $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 portgroup.7.gz ${INSTALLDIR}/share/man/man7
     51        $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "${INSTALLDIR}/share/macports/install"
     52        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 base.mtree "${INSTALLDIR}/share/macports/install/"
     53        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 prefix.mtree "${INSTALLDIR}/share/macports/install/"
     54        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 macosx.mtree "${INSTALLDIR}/share/macports/install/"
     55        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 port.1.gz "${INSTALLDIR}/share/man/man1"
     56        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 macports.conf.5.gz "${INSTALLDIR}/share/man/man5"
     57        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 portfile.7.gz "${INSTALLDIR}/share/man/man7"
     58        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 portstyle.7.gz "${INSTALLDIR}/share/man/man7"
     59        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 porthier.7.gz "${INSTALLDIR}/share/man/man7"
     60        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 portgroup.7.gz "${INSTALLDIR}/share/man/man7"
  • branches/gsoc11-statistics/base/doc/base.mtree.in

    r79672 r105085  
    66/set type=dir uname=@DSTUSR@ gname=@DSTGRP@ mode=@DSTMODE@
    77.
     8    man type=link link=share/man
     9    ..
    810    var
    911        macports
     
    1113            ..
    1214            distfiles
     15            ..
     16            home
     17                Library
     18                    Preferences
     19                    ..
     20                ..
    1321            ..
    1422            logs
  • branches/gsoc11-statistics/base/doc/macports.conf.5

    r82922 r105085  
    9393.Ic Default:
    9494${prefix}/etc/macports/variants.conf
     95.It Va buildfromsource
     96Controls whether ports are built from source or downloaded as pre-built
     97archives. Setting to 'always' will never use archives, 'never' will always
     98try to use an archive and fail if one is not available. 'ifneeded' will try to
     99fetch an archive and fall back to building from source if that isn't possible.
     100.br
     101.Ic Default:
     102ifneeded
    95103.It Va portarchivetype
    96104Format of archives in which to store port images. This controls both the type
     
    180188.Ic Default:
    181189default
     190.It Va startupitem_install
     191Option to install symlinks into /Library/LaunchAgents or
     192/Library/LaunchDaemons; startupitem_install may be empty, "yes" or "no";
     193if the option is NOT "no" then a symlink for the startupitem will be
     194created in the appropriate system directory.
     195.br
     196.Ic Default:
     197yes
    182198.It Va destroot_umask
    183199Umask value to use during the destrooting of a port.
     
    205221.It Va binpath
    206222Sets the directory search path for locating system executables used by MacPorts. This variable should contain
    207 the paths for locating utilities such as rsync, tar, cvs and others. Don't change this unless you understand
    208 and accept the consequences.
     223the paths for locating utilities such as rsync, tar, cvs and others. Changing this is unsupported; don't do so
     224unless you understand and accept the consequences.
    209225.br
    210226.Ic Default:
     
    222238This is a string that uniquely identifies this installation of MacPorts. It is automatically generated
    223239and should not be modified.
     240Changing this is unsupported.
     241.It Va proxy_override_env
     242Proxy support. Precedence is: env, macports.conf, System Preferences.
     243That is, if it's set in the environment, that will be used instead of
     244anything here or in System Preferences. Setting proxy_override_env to
     245yes will cause any proxies set here (or in System Preferences if set
     246there but not here) to override what's in the environment. Note that
     247System Preferences doesn't have an rsync proxy definition. Also note, on
     24810.5, sudo will clear many environment variables including those for
     249proxy support. Equivalent environment variables: http_proxy,
     250HTTPS_PROXY, FTP_PROXY, RSYNC_PROXY, NO_PROXY
     251.br
     252.Ic Default:
     253yes
     254.It Va proxy_http
     255HTTP proxy
     256.br
     257.Ic Default:
     258none
     259.It Va proxy_https
     260HTTPS proxy
     261.br
     262.Ic Default:
     263none
     264.It Va proxy_ftp
     265FTP proxy
     266.br
     267.Ic Default:
     268none
     269.It Va proxy_rsync
     270rsync proxy
     271.br
     272.Ic Default:
     273none
     274.It Va proxy_skip
     275Hosts not to go through the proxy (comma-separated, applies to HTTP,
     276HTTPS and FTP, but not rsync):
     277.br
     278.Ic Default:
     279none
     280.It Va host_blacklist
     281Space separated list of download hosts that should not be used.
     282.br
     283.Ic Default:
     284none
     285.It Va preferred_hosts
     286Space separated list of download hosts that should be used preferentially.
     287.br
     288.Ic Default:
     289none
     290.It Va revupgrade_autorun
     291Controls whether the rev-upgrade action will be run automatically after
     292upgrading ports.
     293.br
     294.Ic Default:
     295yes
     296.It Va revupgrade_mode
     297Controls the rev-upgrade functionality which checks for broken linking and can
     298rebuild ports to fix it. 'rebuild' means ports will automatically be rebuilt
     299when broken linking is detected in their files, while 'report' means broken
     300files will be scanned for and reported but the ports will not be rebuilt.
     301.br
     302.Ic Default:
     303rebuild
     304.It Va default_compiler
     305Default value for configure.compiler. This can be a space-separated list. Later
     306entries will be used if earlier entries are unavailable or blacklisted by a
     307port. Setting this is unsupported.
     308.br
     309.Ic Default:
     310none (internal list based on Xcode version is normally used)
    224311.El
    225312.Sh FILES
  • branches/gsoc11-statistics/base/doc/macports.conf.in

    r79672 r105085  
    1111portdbpath              @localstatedir_expanded@/macports
    1212
    13 # PATH settings that are used for external tools (configure, make, etc.) while installing ports. The default
    14 # paths are given in the example; it need not be uncommented.  Customizing binpath is intended for advanced users only.
     13# PATH settings that are used for external tools (configure, make, etc.) while
     14# installing ports. The default paths are given in the example; it need not be
     15# uncommented.  Customizing binpath is unsupported and is intended for
     16# advanced users only.
    1517#binpath                @prefix_expanded@/bin:@prefix_expanded@/sbin:/bin:/sbin:/usr/bin:/usr/sbin
    1618
    1719# Directory containing Xcode Tools (default is to ask xcode-select)
    18 #developer_dir       @DEVELOPER_DIR@
     20#developer_dir          @DEVELOPER_DIR@
     21
     22# Path to PackageMaker.app
     23# It may be necessary to set this with Xcode >= 4.3, as that version
     24# requires PackageMaker to be installed manually from the Auxiliary Tools for
     25# Xcode disk image. The default is /Applications/PackageMaker.app with Xcode
     26# 4.3 and ${developer_dir}/Applications/Utilities/PackageMaker.app with older
     27# versions.
     28#packagemaker_path /Applications/PackageMaker.app
    1929
    2030# Directory containing Applications from ports.
     
    3040variants_conf           @MPCONFIGDIR_EXPANDED@/variants.conf
    3141
     42# When to build ports from source. Default is 'ifneeded', which downloads an
     43# archive if available or builds from source otherwise. 'always' has the same
     44# effect as -s on the command line, and 'never' is likewise the same as -b.
     45#buildfromsource        ifneeded
     46
    3247# Type of archives to use for port images
    3348#
    3449# Supported types: tgz, tar, tbz, tbz2 (default), tlz, txz, xar, zip, cpgz, cpio
    35 #portarchivetype                tbz2
     50#portarchivetype        tbz2
    3651
    3752# CPU architecture to compile for. Defaults to i386 or ppc on Mac OS X 10.5
    3853# and earlier, depending on the CPU type detected at runtime. On Mac OS X 10.6
    3954# the default is x86_64 if the CPU supports it, i386 otherwise.
    40 #build_arch                     i386
     55#build_arch             i386
    4156
    4257# CPU architectures to use for Universal Binaries (+universal variant)
     
    4459
    4560# Use ccache (C/C++ compiler cache) - see http://ccache.samba.org/
    46 #configureccache                no
     61#configureccache        no
    4762
    4863# Location where ccache stores its files
    49 #ccache_dir                     @localstatedir_expanded@/macports/build/.ccache
     64#ccache_dir             @localstatedir_expanded@/macports/build/.ccache
    5065
    5166# Maximum size ccache may use.
    5267# Use 'G', 'M', or 'K' suffix for giga-, mega- or kilobytes.
    53 #ccache_size                    2G
     68#ccache_size            2G
    5469
    5570# Use distcc (distributed compiler) - see http://distcc.samba.org/
    56 #configuredistcc                no
     71#configuredistcc        no
    5772
    5873# Use pipes rather than intermediate files when compiling C/C++/etc
     
    6984
    7085# umask value to use when a port installs its files
    71 #destroot_umask 022
     86#destroot_umask         022
    7287
    7388# Set whether to automatically execute "clean" after "install" of ports
     
    7590
    7691# Set to yes if you don't want logs to be deleted after successful builds
    77 #keeplogs no
     92#keeplogs               no
    7893
    7994# Rsync server to fetch MacPorts sources from. Note that this is only used
     
    88103# If this points to a .tar file, a signed .rmd160 must exist next to it
    89104# on the server and will be used to verify its integrity.
    90 #rsync_dir                      release/tarballs/base.tar
     105#rsync_dir              release/tarballs/base.tar
    91106
    92107# Rsync options
     
    101116# are installed.
    102117#startupitem_type       default
     118
     119# Option to install symlinks into /Library/LaunchAgents or /Library/LaunchDaemons
     120# startupitem_install may be empty, "yes" or "no";
     121# if the option is NOT "no" then a symlink for the startupitem will be created in
     122# the appropriate system directory.
     123#startupitem_install    yes
    103124
    104125# Extra environment variables to keep. Any variables listed here are added
     
    120141# RSYNC_PROXY, NO_PROXY
    121142#
    122 #proxy_override_env    yes
     143#proxy_override_env     yes
    123144# HTTP proxy:
    124 #proxy_http            hostname:12345
     145#proxy_http             hostname:12345
    125146# HTTPS proxy:
    126 #proxy_https       hostname:12345
     147#proxy_https            hostname:12345
    127148# FTP proxy:
    128 #proxy_ftp         hostname:12345
     149#proxy_ftp              hostname:12345
    129150# rsync proxy:
    130 #proxy_rsync       hostname:12345
     151#proxy_rsync            hostname:12345
    131152# hosts not to go through the proxy (comma-separated, applies to HTTP, HTTPS,
    132153# and FTP, but not rsync):
     
    143164# Unique identifier for usage statistics
    144165stats_id        @STATS_UUID@
     166
     167# Options 'host_blacklist' and 'preferred_hosts', used for indicating
     168# space separated lists of download hosts that should not be used or
     169# should be used preferentially, respectively. These override the usual
     170# ping time check.
     171#host_blacklist     badhost1.org badhost2.org
     172#preferred_hosts    preferredhost1.org preferredhost2.org
     173
     174# Set whether to automatically run rev-upgrade after upgrading ports
     175#revupgrade_autorun yes
     176# Option controlling action taken by rev-upgrade, which checks for broken
     177# linking and can rebuild affected ports. Possible values are
     178#'rebuild' (default) or 'report'.
     179#revupgrade_mode        rebuild
  • branches/gsoc11-statistics/base/doc/port.1

    r88412 r105085  
    253253force mode (ignore state file)
    254254.It Fl o
    255 honor state files older than Portfile
     255honor state files even if the Portfile has been modified since (called -o because it used to mean "older")
    256256.It Fl s
    257257source-only mode (build and install from source, do not attempt to fetch binary archives)
     
    368368To uninstall all installed but inactive ports, use
    369369.Fl u .
    370 To recursively uninstall all dependents of
     370To recursively uninstall all ports that depend on
    371371.Ar portname
    372372before uninstalling the port itself, use
     
    374374To uninstall
    375375.Ar portname
    376 and then recursively uninstall all its dependencies, use
     376and then recursively uninstall all ports it depended on, use
    377377.Fl -follow-dependencies .
    378378This will not uninstall dependencies that are marked as requested or that have other dependents.
     
    511511It is disabled by default and can be enabled by passing \fB--id-loadcmd-check\fP
    512512to \fBrev-upgrade\fP.
     513.Pp
     514See also:
     515.Xr macports.conf 5
    513516.Ss clean
    514517Clean the files used for building
     
    541544.Dl "port log --phase configure vim"
    542545.Dl "port log --phase fetch --verbosity debug vim"
     546.Pp
     547.Ss logfile
     548Displays the path to the log file for
     549.Ar portname .
    543550.Pp
    544551.Ss echo
     
    630637Opens
    631638.Ar Portfile
    632 with your default editor specified in your shell's environment variable. Alias
    633 .Ar ed
    634 also invokes this command.
     639with your default editor specified in your shell's environment variable.
    635640.Pp
    636641You can also use the
     
    639644.Dl port edit --editor nano apache2
    640645.Pp
    641 .Ss ed
    642 An alias for
    643 .Ic edit .
    644646.Ss fetch
    645647Fetches the distribution files required to build
  • branches/gsoc11-statistics/base/doc/portfile.7

    r88412 r105085  
    11.\" portfile.7
    22.\"
    3 .\" Copyright (c) 2004-2011 The MacPorts Project
     3.\" Copyright (c) 2004-2013 The MacPorts Project
    44.\" Copyright (c) 2002-2003 Apple Inc.
    55.\" All rights reserved.
     
    450450.Sy Example:
    451451.Dl installs_libs no
     452.It Ic license_noconflict
     453By default, it is assumed that ports may use libraries or headers from their
     454dependencies and thus form a derivative work. A dependency with an
     455incompatible license thus prevents the port from being distributed in binary
     456form. If a dependency with an incompatible license is not used in such a way
     457that a derivative work is formed, or should not prevent binary distribution
     458for any other reason, add its name to this list.
     459.br
     460.Sy Type:
     461.Em optional
     462.br
     463.Sy Default:
     464.Em none
     465.br
     466.Sy Example:
     467.Dl license_noconflict openssl
     468.Dl license_noconflict readline gdbm
    452469.El
    453470.Sh TARGET HOOKS
     
    10941111.br
    10951112.Sy Default:
    1096 .Em -O2
     1113.Em -Os
    10971114.br
    10981115.Sy Example:
     
    12321249.Em macports-gcc-4.5
    12331250.Em macports-gcc-4.6
     1251.Em macports-gcc-4.7
     1252.Em macports-gcc-4.8
    12341253.Em macports-llvm-gcc-4.2
    12351254use the vanilla compiler suites installed via MacPorts.
     
    12391258.br
    12401259.Sy Values:
    1241 .Em gcc-3.3 gcc-4.0 gcc-4.2 llvm-gcc-4.2 clang apple-gcc-4.0 apple-gcc-4.2 macports-gcc-4.2 macports-gcc-4.3 macports-gcc-4.4 macports-gcc-4.5 macports-gcc-4.6 macports-llvm-gcc-4.2
     1260.Em gcc-3.3 gcc-4.0 gcc-4.2 llvm-gcc-4.2 clang apple-gcc-4.0 apple-gcc-4.2 macports-gcc-4.2 macports-gcc-4.3 macports-gcc-4.4 macports-gcc-4.5 macports-gcc-4.6 macports-gcc-4.7 macports-gcc-4.8 macports-llvm-gcc-4.2
    12421261.br
    12431262.Sy Example:
     
    16561675What kind of check to perform to figure out if the software has been updated.
    16571676Can be
    1658 .Em freshmeat
    1659 (uses the date_updated tag of the freshmeat XML file),
     1677.Em freecode
     1678(uses the date_updated tag of the freecode XML file),
    16601679.Em sourceforge
    16611680(uses the version of the latest file release of the project),
     
    16811700.Em googlecode
    16821701if the master_sites is one of these, else
    1683 .Em freshmeat
     1702.Em freecode
    16841703.br
    16851704.Sy Values:
    1686 .Em freshmeat sourceforge googlecode moddate regex regexm md5 none
     1705.Em freecode sourceforge googlecode moddate regex regexm md5 none
    16871706.It Ic livecheck.name
    1688 Name of the project for live checks (used for freshmeat, sourceforge, and googlecode checks).
     1707Name of the project for live checks (used for freecode, sourceforge, and googlecode checks).
    16891708.br
    16901709.Sy Type:
     
    16931712.Sy Default:
    16941713.Em ${name}
    1695 or the sourceforge/freshmeat/googlecode project name if it can be guessed by looking at the master_sites.
     1714or the sourceforge/freecode/googlecode project name if it can be guessed by looking at the master_sites.
    16961715.It Ic livecheck.distname
    16971716Name of the file release (used for sourceforge and googlecode checks).
     
    17251744.Em ${homepage}
    17261745or
    1727 .Em http://freshmeat.net/projects-xml/${livecheck.name}/${livecheck.name}.xml
     1746.Em http://freecode.com/projects/${livecheck.name}/releases.atom
    17281747or
    17291748.Em http://sourceforge.net/export/rss2_projfiles.php?project=${livecheck.name}
Note: See TracChangeset for help on using the changeset viewer.