Changeset 40953


Ignore:
Timestamp:
Oct 19, 2008, 12:26:55 AM (12 years ago)
Author:
raimue@…
Message:

Merged revisions 38101-38102,38107,38109,38114-38115,38163,38230,38232,38252,38255,38271,38304,38315-38317,38331-38332,38344,38495-38497,38506,38556-38557,38577,38683-38684,38753,38756,38765,38835,38883,38940-38942,38960-38961,38973,39012,39016-39017,39021,39023,39025,39036,39116,39177,39257,39564,39573,39990,40051-40061,40142,40159,40387,40414,40445,40450,40475-40476,40693,40712,40729,40803,40824,40834,40836,40894,40906,40952 via svnmerge from
https://svn.macports.org/repository/macports/trunk/base

........

r38101 | raimue@… | 2008-07-06 18:41:47 +0200 (Sun, 06 Jul 2008) | 3 lines


doc/Makefile:
gzip man pages on make all

........

r38102 | raimue@… | 2008-07-06 18:43:33 +0200 (Sun, 06 Jul 2008) | 3 lines


doc:
Ignore generated gzipped man pages

........

r38107 | raimue@… | 2008-07-06 20:49:40 +0200 (Sun, 06 Jul 2008) | 3 lines


Makefile.in:
Remove Doxyfile on distclean

........

r38109 | raimue@… | 2008-07-06 22:27:48 +0200 (Sun, 06 Jul 2008) | 5 lines


base:
Add a new setupenv.sh script which can be used to setup the environment for
MacPorts. It will be installed to ${prefix}/share/macports/setupenv.sh and can
be sourced from your profile.

........

r38114 | raimue@… | 2008-07-07 02:38:32 +0200 (Mon, 07 Jul 2008) | 3 lines


base:
Rename setupenv.sh to setupenv.bash to reflect that it is for bash only

........

r38115 | raimue@… | 2008-07-07 03:00:40 +0200 (Mon, 07 Jul 2008) | 3 lines


setupenv.bash.in:
Set svn:keywords=Id and svn:eol-style=native

........

r38163 | jmr@… | 2008-07-10 03:50:57 +0200 (Thu, 10 Jul 2008) | 2 lines


In fetch, gracefully handle failure to spawn ping processes. (#15906)

........

r38230 | raimue@… | 2008-07-13 12:06:54 +0200 (Sun, 13 Jul 2008) | 3 lines


port/port.tcl:
Exit gracefully if an invalid global option was given

........

r38232 | jmr@… | 2008-07-13 12:25:29 +0200 (Sun, 13 Jul 2008) | 2 lines


Mirror sites: add new transact SourceForge mirror

........

r38252 | raimue@… | 2008-07-13 23:40:06 +0200 (Sun, 13 Jul 2008) | 3 lines


doc/port.1:
Document 'port edit --editor'

........

r38255 | raimue@… | 2008-07-14 00:38:40 +0200 (Mon, 14 Jul 2008) | 4 lines


port/port.tcl:
Convert list to string to allow additional parameters,
for example port edit --editor 'vim -y'

........

r38271 | mww@… | 2008-07-14 16:29:47 +0200 (Mon, 14 Jul 2008) | 3 lines


add 'llvm-gcc-4.2' compiler suite (from XCode 3.1);
make a wild guess at default compiler choice for 10.6;

........

r38304 | raimue@… | 2008-07-15 07:33:22 +0200 (Tue, 15 Jul 2008) | 6 lines


port1.0/portconfigure.tcl:
Add a new command 'use_autoreconf'
This can replace instances of 'system' in our Portfiles, especially when a port
runs any combination of aclocal/autoconf/automake/, as autoreconf automatically
figures out what needs to be run.

........

r38315 | ryandesign@… | 2008-07-15 11:38:03 +0200 (Tue, 15 Jul 2008) | 2 lines


portbuild.tcl: simplify port output by no longer showing the build target; closes #15881

........

r38316 | ryandesign@… | 2008-07-15 11:44:14 +0200 (Tue, 15 Jul 2008) | 2 lines


ChangeLog: Note fix for #15881

........

r38317 | jmr@… | 2008-07-15 14:47:07 +0200 (Tue, 15 Jul 2008) | 2 lines


Don't use quotes when setting MACOSX_DEPLOYMENT_TARGET in the env_array, for consistency

........

r38331 | jmr@… | 2008-07-16 07:35:46 +0200 (Wed, 16 Jul 2008) | 2 lines


ChangeLog: distfiles mirror is added to patch_sites too

........

r38332 | jmr@… | 2008-07-16 07:47:24 +0200 (Wed, 16 Jul 2008) | 2 lines


ChangeLog: note the fix for the case-sensitive deactivate bug (#11759)

........

r38344 | raimue@… | 2008-07-16 17:00:40 +0200 (Wed, 16 Jul 2008) | 4 lines


Makefile.in:
Added the install line for setupenv.bash at the wrong place which prevented
install to complete due to a missing directory.

........

r38495 | wsiegrist@… | 2008-07-22 20:09:32 +0200 (Tue, 22 Jul 2008) | 2 lines


Add checks to cleanup exports leftover from failed mprsyncup runs

........

r38496 | wsiegrist@… | 2008-07-22 20:36:55 +0200 (Tue, 22 Jul 2008) | 2 lines


Updating jobs scripts from servers: Use a more appropriate tmp dir

........

r38497 | wsiegrist@… | 2008-07-22 20:40:15 +0200 (Tue, 22 Jul 2008) | 2 lines


Adding scripts used on the servers for mirroring during post-commit and daily

........

r38506 | rhwood@… | 2008-07-23 11:43:14 +0200 (Wed, 23 Jul 2008) | 7 lines


Armahg's patch to macports::ui_init for the GSOC08 frameworks project.


This patch allows users of the Tcl API for MacPorts to define custom ui_*
procedures message handling mechanisms.


Closes #15913, committing per email and IRC conversation.

........

r38556 | ryandesign@… | 2008-07-25 08:58:30 +0200 (Fri, 25 Jul 2008) | 2 lines


portbuild.tcl: allow parallel builds for scons too, not just for make

........

r38557 | ryandesign@… | 2008-07-25 09:06:16 +0200 (Fri, 25 Jul 2008) | 2 lines


ChangeLog: note parallel build support for scons-based ports in r38556

........

r38577 | afb@… | 2008-07-25 11:44:33 +0200 (Fri, 25 Jul 2008) | 2 lines


don't use build.nice for creative build.cmd lines (#16091)

........

r38683 | febeling@… | 2008-07-28 23:21:33 +0200 (Mon, 28 Jul 2008) | 9 lines


Support for ruby19 ports in the ruby port group.


The command ruby.setup accepts an new optional
parameter "implementation", which is ruby18 by
default, and can also be ruby19. (As more ruby
implementations appear these may be added as
well.) Unit tests are in the new sub-directory
tests/.

........

r38684 | febeling@… | 2008-07-28 23:32:47 +0200 (Mon, 28 Jul 2008) | 2 lines


ChangeLog for ruby group change, #15912.

........

r38753 | afb@… | 2008-07-30 09:30:39 +0200 (Wed, 30 Jul 2008) | 2 lines


update changelog for r38577

........

r38756 | afb@… | 2008-07-30 12:13:23 +0200 (Wed, 30 Jul 2008) | 2 lines


unbreak test case when ruby19 is not installed or not running leopard

........

r38765 | toby@… | 2008-07-30 21:59:14 +0200 (Wed, 30 Jul 2008) | 2 lines


fix distclean

........

r38835 | febeling@… | 2008-08-01 10:47:58 +0200 (Fri, 01 Aug 2008) | 2 lines


remove hard-coded mp prefix in test case setup

........

r38883 | wsiegrist@… | 2008-08-02 01:53:41 +0200 (Sat, 02 Aug 2008) | 2 lines


Make the guide chunkier at <http://guide.macports.org/chunked/>

........

r38940 | raimue@… | 2008-08-03 10:05:42 +0200 (Sun, 03 Aug 2008) | 4 lines


pextlib1.0:
Add a wrapper for isatty(3). Add term_get_size to find the size of a connected
terminal for a channel using ioctl(2).

........

r38941 | raimue@… | 2008-08-03 10:10:26 +0200 (Sun, 03 Aug 2008) | 4 lines


port/port.tcl:
Use isatty and term_get_size from pextlib to determine the size of the
connected terminal. This requires the Pextlib package.

........

r38942 | raimue@… | 2008-08-03 10:19:05 +0200 (Sun, 03 Aug 2008) | 3 lines


pextlib1.0/tty.c:
Tabs to spaces

........

r38960 | afb@… | 2008-08-04 11:23:00 +0200 (Mon, 04 Aug 2008) | 2 lines


add use_lzma for .tar.lzma support

........

r38961 | afb@… | 2008-08-04 11:29:00 +0200 (Mon, 04 Aug 2008) | 2 lines


fix typo

........

r38973 | jmr@… | 2008-08-04 18:11:28 +0200 (Mon, 04 Aug 2008) | 2 lines


mirror sites: order sourceforge mirrors more or less geographically

........

r39012 | jmr@… | 2008-08-06 08:56:11 +0200 (Wed, 06 Aug 2008) | 2 lines


Fix invalid DOCTYPE in generated launchd .plists. Thanks to blb for the patch. Closes #16200.

........

r39016 | afb@… | 2008-08-06 09:42:34 +0200 (Wed, 06 Aug 2008) | 2 lines


work around Leopard Tcl bugs (#16010)

........

r39017 | afb@… | 2008-08-06 09:46:08 +0200 (Wed, 06 Aug 2008) | 2 lines


work around Leopard Tcl bugs (#16233)

........

r39021 | afb@… | 2008-08-06 09:53:18 +0200 (Wed, 06 Aug 2008) | 2 lines


update changelog

........

r39023 | ryandesign@… | 2008-08-06 10:00:26 +0200 (Wed, 06 Aug 2008) | 2 lines


ChangeLog: consolidate entries for Leopard environment variable issue

........

r39025 | ryandesign@… | 2008-08-06 10:36:18 +0200 (Wed, 06 Aug 2008) | 2 lines


portlint.tcl, portutil.tcl: undo changes inadvertently committed in r39023

........

r39036 | raimue@… | 2008-08-06 15:56:52 +0200 (Wed, 06 Aug 2008) | 4 lines


port/port.tcl:
In 'port gohome', use homepage variable from PortIndex if available. Otherwise
read it from the Portfile. This way, this command works faster. Closes #16146.

........

r39116 | jmr@… | 2008-08-08 18:12:16 +0200 (Fri, 08 Aug 2008) | 2 lines


Add clean_dep_map proc to registry, for removing duplicate dependency entries. (See #8763)

........

r39177 | simon@… | 2008-08-11 14:22:33 +0200 (Mon, 11 Aug 2008) | 2 lines


base: Typo fix in portfetch.tcl.

........

r39257 | afb@… | 2008-08-14 15:05:43 +0200 (Thu, 14 Aug 2008) | 2 lines


add new primary category: office (#16311)

........

r39564 | ryandesign@… | 2008-08-25 07:06:35 +0200 (Mon, 25 Aug 2008) | 2 lines


gcc-dp-* was renamed to gcc-mp-* quite some time ago

........

r39573 | raimue@… | 2008-08-25 19:18:20 +0200 (Mon, 25 Aug 2008) | 3 lines


port1.0/portconfigure.tcl:
Return an error if an invalid value was given to configure.compiler

........

r39990 | ryandesign@… | 2008-09-16 00:54:08 +0200 (Tue, 16 Sep 2008) | 2 lines


PortIndexRegen.sh: fix typo in comment

........

r40051 | toby@… | 2008-09-19 04:08:13 +0200 (Fri, 19 Sep 2008) | 2 lines


fix warnings

........

r40052 | toby@… | 2008-09-19 04:08:41 +0200 (Fri, 19 Sep 2008) | 2 lines


eliminate some -Wformat-security issues

........

r40053 | toby@… | 2008-09-19 04:12:52 +0200 (Fri, 19 Sep 2008) | 2 lines


another -Wformat-security fix

........

r40054 | toby@… | 2008-09-19 04:22:41 +0200 (Fri, 19 Sep 2008) | 2 lines


fix typecasts

........

r40055 | toby@… | 2008-09-19 04:33:48 +0200 (Fri, 19 Sep 2008) | 3 lines


Prefer -UTF8String over long-deprecated -cString.
Eliminate a format string issue.

........

r40056 | toby@… | 2008-09-19 04:42:46 +0200 (Fri, 19 Sep 2008) | 2 lines


Stop setting MACOSX_DEPLOYMENT_TARGET

........

r40057 | toby@… | 2008-09-19 04:49:56 +0200 (Fri, 19 Sep 2008) | 2 lines


-framework Foundation is meaningless when compiling, don't include in CFLAGS

........

r40058 | toby@… | 2008-09-19 04:53:51 +0200 (Fri, 19 Sep 2008) | 2 lines


another typecast fix

........

r40059 | toby@… | 2008-09-19 05:14:25 +0200 (Fri, 19 Sep 2008) | 2 lines


Somewhat ugly hack to eliminate PACKAGE_* warning spam.

........

r40060 | toby@… | 2008-09-19 05:20:22 +0200 (Fri, 19 Sep 2008) | 2 lines


handle _ in arch name (x86_64)

........

r40061 | toby@… | 2008-09-19 05:26:27 +0200 (Fri, 19 Sep 2008) | 2 lines


more warning fixes

........

r40142 | jmr@… | 2008-09-22 12:43:46 +0200 (Mon, 22 Sep 2008) | 2 lines


Run a script in 'make install' and .dmg postflight which removes any duplicate entries from the dep_map (#8763)

........

r40159 | jmr@… | 2008-09-23 03:12:18 +0200 (Tue, 23 Sep 2008) | 2 lines


Run dep_map_clean.tcl *after* installing, so it works on new installs.

........

r40387 | jmpp@… | 2008-09-30 09:35:42 +0200 (Tue, 30 Sep 2008) | 8 lines



It doesn't really matter as we don't have any Portfiles with non-ascii characters, as far as I've been able to see...
But stil, since we operate fully on utf8 mode when reading the Portfiles, we might as well store them as such in the db.


PS: As far as I'm aware, changes to this script require manual reinstallation, as our Makefiles don't install it by default.
PSS: Once reinstalled and the new, fully utf8 tables have been created, a "mysql_set_charset('utf8',$portsdb_connection);"
instruction would be appropriate in the else block of the portsdb_connect() function in trunk/www/includes/common.inc.

........

r40414 | raimue@… | 2008-10-01 04:53:38 +0200 (Wed, 01 Oct 2008) | 4 lines


port/port.tcl:
Quote homepage URL to avoid problems with special shell characters like '&'.
Closes #16491

........

r40445 | febeling@… | 2008-10-02 10:02:08 +0200 (Thu, 02 Oct 2008) | 2 lines


portlint.tcl: add erlang primary category

........

r40450 | macsforever2000@… | 2008-10-02 15:13:44 +0200 (Thu, 02 Oct 2008) | 2 lines


Added finance and gis as primary categories.

........

r40475 | toby@… | 2008-10-02 23:11:13 +0200 (Thu, 02 Oct 2008) | 2 lines


s/Keven/Kevin/

........

r40476 | toby@… | 2008-10-02 23:12:32 +0200 (Thu, 02 Oct 2008) | 3 lines


Include stdint.h to correctly get intptr_t.
Fixes #16718

........

r40693 | raimue@… | 2008-10-11 01:35:39 +0200 (Sat, 11 Oct 2008) | 4 lines


port/port.tcl:
Fix 'port cat'; A newline was always appended on the end of the file and there
was a problem with files larger than 4096 bytes. Closes #16817

........

r40712 | raimue@… | 2008-10-12 04:53:54 +0200 (Sun, 12 Oct 2008) | 4 lines


base:
Inheritance of macports.conf, patch by Adam Byrtek
Closes #16329

........

r40729 | jmr@… | 2008-10-13 01:37:22 +0200 (Mon, 13 Oct 2008) | 2 lines


Make 'port deps' show the correct dependencies when variants are given. (#11891)

........

r40803 | jmr@… | 2008-10-15 12:17:48 +0200 (Wed, 15 Oct 2008) | 2 lines


Move default frameworks_dir under prefix, and use it in portgroups

........

r40824 | nox@… | 2008-10-15 18:35:54 +0200 (Wed, 15 Oct 2008) | 2 lines


Fixed a bug introduced in r40803, variables were not imported in the proc scope.

........

r40834 | jmr@… | 2008-10-16 01:25:40 +0200 (Thu, 16 Oct 2008) | 2 lines


Fix _libtest breakage introduced in r40803 (#16877)

........

r40836 | toby@… | 2008-10-16 03:32:21 +0200 (Thu, 16 Oct 2008) | 2 lines


support platform releases with multiple versions, because nine plus one is ten

........

r40894 | simon@… | 2008-10-17 15:33:45 +0200 (Fri, 17 Oct 2008) | 2 lines


base: Add support to fetch using Mercurial.

........

r40906 | ryandesign@… | 2008-10-18 01:18:28 +0200 (Sat, 18 Oct 2008) | 2 lines


mirror_sites.tcl: remove stale ftp.uu.net mirror; see http://lists.macosforge.org/pipermail/macports-dev/2008-October/006191.html

........

r40952 | blb@… | 2008-10-19 01:37:46 +0200 (Sun, 19 Oct 2008) | 2 lines


Fix unarchive using xar, #16806

........

Location:
branches/variant-descs-14482/base
Files:
52 edited
8 copied

Legend:

Unmodified
Added
Removed
  • branches/variant-descs-14482/base

  • branches/variant-descs-14482/base/ChangeLog

    r37509 r40953  
    66
    77Unreleased:
     8    - Changes in loading of configuration files. Currently the global
     9      configuration file is loaded first, then user defined one (if present),
     10      PORTSRC environment variable is loaded last. Last defined value is used
     11      for each configuration option. (#16329, contributed by Adam Byrtek)
     12
     13    - Ruby port group now accepts a new (optional) last parameter for the
     14      ruby.setup command, "implementation". It is "ruby" by default, and
     15      can be set to "ruby19". It names the ruby-implementing port, and can
     16      possibly support still other rubys in the future. (#15912, febeling
     17      in 38683)
     18       
     19    - Don't use build.nice for complex build.cmd commands (#16091)
     20
     21    - The buildmakejobs setting now also affects ports using the scons build
     22      system, so now scons-based ports can be built in parallel too. Previously
     23      only automake-based ports were supported. (ryandesign in r38556)
     24
     25    - User-supplied port names are now treated in a fully case-insensitive
     26      manner. This fixes a bug where giving the name with incorrect case when
     27      deactivating/uninstalling would cause all the port's files to be left
     28      behind. (#11759, jmr/raimue in r37349, 37621)
     29   
     30    - The non-verbose output for the build phase no longer shows what target
     31      was used. This makes the build phase consistent with the other phases
     32      which also do not show details. If details are desired, the debug or
     33      verbose switches should be used. (#15881, raimue/ryandesign in r38315)
     34
    835    - Make missing sed extended regexp (for reinplace -E) into a runtime error.
    936      (#15577, afb in r37501)
     
    1542
    1643    - We now have a mirror of (almost) all distfiles at distfiles.macports.org,
    17       and it is automatically appended to master_sites (#15456, jmr in r37217)
     44      and it is automatically appended to master_sites and patch_sites (#15456,
     45      jmr in r37217, 37255)
    1846
    1947    - port search looks now in name, description and long_description for the
     
    5078      (#10768, jmr in r36648)
    5179
    52     - Explicitly use unsetenv(3) on all environment variables (#13930)
     80    - Explicitly use unsetenv(3) on all environment variables (#13930, #16010,
     81      #16233)
    5382
    5483    - Make the included tclthread compile on Leopard if configured (#13495)
  • branches/variant-descs-14482/base/Makefile.in

    r34251 r40953  
    3838
    3939install::
     40        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 setupenv.bash  ${datadir}/macports/
     41# Remove duplicate entries from the dependency map (could occur with 1.6 and earlier):
     42        $(TCLSH) src/dep_map_clean.tcl ${TCL_PACKAGE_DIR}
    4043        @echo ""; echo "Congratulations, you have successfully installed the MacPorts system. To get the Portfiles and update the system, run:"; echo ""
    4144        @echo "sudo port -v selfupdate"; echo ""
     
    4952        rm -rf autom4te.cache ${DISTDIR}
    5053        rm -f Makefile Mk/macports.autoconf.mk portmgr/fedora/macports.spec portmgr/freebsd/Makefile
     54        rm -f Doxyfile
     55        rm -f setupenv.bash
    5156
    5257_gettag:
  • branches/variant-descs-14482/base/Mk/macports.autoconf.mk.in

    r32210 r40953  
    1111OBJCFLAGS               = @OBJCFLAGS@ $(CFLAGS_WERROR) ${CFLAGS_DEBUG} $(CFLAGS_OPTIMIZE) $(CPPFLAGS)
    1212CPPFLAGS                = @CPPFLAGS@ @DEFS@ @INCLUDES@ @TCL_INCLUDES@
    13 TCL_DEFS                = @TCL_DEFS@
     13TCL_DEFS                = @TCL_DEFS@ -UPACKAGE_NAME -UPACKAGE_TARNAME -UPACKAGE_VERSION -UPACKAGE_STRING -UPACKAGE_BUGREPORT
    1414SHLIB_CFLAGS            = @SHLIB_CFLAGS@
    1515CFLAGS_DEBUG            = @CFLAGS_DEBUG@
  • branches/variant-descs-14482/base/aclocal.m4

    r37509 r40953  
    389389
    390390        if test "x$MPFRAMEWORKSDIR" = "x" ; then
    391             if test "$DSTUSR" = "root" ; then
    392                 MPFRAMEWORKSDIR="/Library/Frameworks"
    393             else
    394                 MPFRAMEWORKSDIR="~$DSTUSR/Library/Frameworks"
    395             fi
     391                MPFRAMEWORKSDIR="${prefix}/Library/Frameworks"
    396392        fi
    397393
     
    822818        # Due to a bug in dist, --arch flags are improperly supplied by curl-config.
    823819        # Get rid of them.
    824         LDFLAGS_LIBCURL=$($CURL_CONFIG --libs | [sed 's/-arch [A-Za-z0-9]* //g'])
     820        LDFLAGS_LIBCURL=$($CURL_CONFIG --libs | [sed 's/-arch [A-Za-z0-9_]* //g'])
    825821
    826822        AC_SUBST(CFLAGS_LIBCURL)
  • branches/variant-descs-14482/base/configure

    r38100 r40953  
    60626062
    60636063                # Set NeXT LIBS and CFLAGS
    6064                 APPLE_FOUNDATION_CFLAGS="-framework Foundation"
     6064                APPLE_FOUNDATION_CFLAGS=""
    60656065                APPLE_FOUNDATION_LIBS="-framework Foundation"
    60666066
     
    68496849
    68506850        if test "x$MPFRAMEWORKSDIR" = "x" ; then
    6851             if test "$DSTUSR" = "root" ; then
    6852                 MPFRAMEWORKSDIR="/Library/Frameworks"
    6853             else
    6854                 MPFRAMEWORKSDIR="~$DSTUSR/Library/Frameworks"
    6855             fi
     6851                MPFRAMEWORKSDIR="${prefix}/Library/Frameworks"
    68566852        fi
    68576853
     
    1202012016        # Due to a bug in dist, --arch flags are improperly supplied by curl-config.
    1202112017        # Get rid of them.
    12022         LDFLAGS_LIBCURL=$($CURL_CONFIG --libs | sed 's/-arch [A-Za-z0-9]* //g')
     12018        LDFLAGS_LIBCURL=$($CURL_CONFIG --libs | sed 's/-arch [A-Za-z0-9_]* //g')
    1202312019
    1202412020
     
    1229012286if false && test -d /etc/paths.d -a -d /etc/manpaths.d -a "$mpprefix" = "$ac_default_prefix"; then
    1229112287        PATHCONF=pathconf
     12288        ac_config_files="$ac_config_files src/pathconf/Makefile src/pathconf/paths src/pathconf/manpaths"
     12289
    1229212290        { echo "$as_me:$LINENO: result: yes" >&5
    1229312291echo "${ECHO_T}yes" >&6; }
     
    1237812376
    1237912377# Output
    12380 ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf portmgr/freebsd/Makefile portmgr/fedora/macports.spec src/Makefile src/macports1.0/macports_autoconf.tcl src/tclobjc1.0/Makefile src/pathconf/Makefile src/pathconf/paths src/pathconf/manpaths src/port1.0/port_autoconf.tcl src/registry1.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl"
     12378ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf portmgr/freebsd/Makefile portmgr/fedora/macports.spec src/Makefile src/macports1.0/macports_autoconf.tcl src/tclobjc1.0/Makefile src/port1.0/port_autoconf.tcl src/registry1.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl setupenv.bash"
    1238112379
    1238212380
     
    1293612934    "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
    1293712935    "src/programs/daemondo/Makefile") CONFIG_FILES="$CONFIG_FILES src/programs/daemondo/Makefile" ;;
     12936    "src/pathconf/Makefile") CONFIG_FILES="$CONFIG_FILES src/pathconf/Makefile" ;;
     12937    "src/pathconf/paths") CONFIG_FILES="$CONFIG_FILES src/pathconf/paths" ;;
     12938    "src/pathconf/manpaths") CONFIG_FILES="$CONFIG_FILES src/pathconf/manpaths" ;;
    1293812939    "Doxyfile") CONFIG_FILES="$CONFIG_FILES Doxyfile" ;;
    1293912940    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     
    1294712948    "src/macports1.0/macports_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_autoconf.tcl" ;;
    1294812949    "src/tclobjc1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/tclobjc1.0/Makefile" ;;
    12949     "src/pathconf/Makefile") CONFIG_FILES="$CONFIG_FILES src/pathconf/Makefile" ;;
    12950     "src/pathconf/paths") CONFIG_FILES="$CONFIG_FILES src/pathconf/paths" ;;
    12951     "src/pathconf/manpaths") CONFIG_FILES="$CONFIG_FILES src/pathconf/manpaths" ;;
    1295212950    "src/port1.0/port_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/port1.0/port_autoconf.tcl" ;;
    1295312951    "src/registry1.0/registry_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/registry1.0/registry_autoconf.tcl" ;;
    1295412952    "src/programs/Makefile") CONFIG_FILES="$CONFIG_FILES src/programs/Makefile" ;;
    1295512953    "src/macports1.0/macports_fastload.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_fastload.tcl" ;;
     12954    "setupenv.bash") CONFIG_FILES="$CONFIG_FILES setupenv.bash" ;;
    1295612955
    1295712956  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  • branches/variant-descs-14482/base/configure.ac

    r38100 r40953  
    337337if false && test -d /etc/paths.d -a -d /etc/manpaths.d -a "$mpprefix" = "$ac_default_prefix"; then
    338338        PATHCONF=pathconf
     339        AC_CONFIG_FILES([src/pathconf/Makefile src/pathconf/paths src/pathconf/manpaths])
    339340        AC_MSG_RESULT([yes])
    340341else
     
    406407        src/macports1.0/macports_autoconf.tcl
    407408        src/tclobjc1.0/Makefile
    408         src/pathconf/Makefile
    409         src/pathconf/paths
    410         src/pathconf/manpaths
    411409        src/port1.0/port_autoconf.tcl
    412410        src/registry1.0/registry_autoconf.tcl
    413411        src/programs/Makefile
    414412        src/macports1.0/macports_fastload.tcl
     413        setupenv.bash
    415414])
    416415
  • branches/variant-descs-14482/base/doc

    • Property svn:ignore
      •  

        old new  
        22prefix.mtree
        33macosx.mtree
         4*[0-9].gz
  • branches/variant-descs-14482/base/doc/Makefile

    r37509 r40953  
    99endif
    1010
    11 all:
     11all: ${MAN1:.1=.1.gz} ${MAN5:.5=.5.gz} ${MAN7:.7=.7.gz}
    1212
    1313clean:
     
    2828        gzip -c $^ > $@
    2929
    30 install: ${MAN1:.1=.1.gz} ${MAN5:.5=.5.gz} ${MAN7:.7=.7.gz}
     30install: all
    3131        $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
    3232        $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${mpconfigdir}
  • branches/variant-descs-14482/base/doc/macports.conf.5

    r34360 r40953  
    9797.br
    9898.Ic Default:
    99 /Library/Frameworks
     99${prefix}/Library/Frameworks
    100100.It Va sources_conf
    101101Location of the sources file. This file enables rsync synchronization of the default ports tree with the
  • branches/variant-descs-14482/base/doc/port.1

    r37509 r40953  
    438438.Ar ed
    439439also invokes this command.
     440.Pp
     441You can also use the
     442.Fl -editor
     443flag on the command line to specify an alternative editor. For example:
     444.Dl port edit --editor nano apache2
     445.Pp
    440446.Ss unarchive
    441447Unpack the port from a pre-built binary archive. When archive mode is enabled, this command is called automatically, prior to
  • branches/variant-descs-14482/base/doc/portfile.7

    r37509 r40953  
    613613Use bzip2.
    614614.br
    615 Sets extract.suffix to: .bzip2
     615Sets extract.suffix to: .bz2
    616616.br
    617617Sets extract.cmd to: bzip2
     
    622622.Sy Example:
    623623.Dl use_bzip2 yes
     624.It Ic use_lzma
     625Use lzma.
     626.br
     627Sets extract.suffix to: .lzma
     628.br
     629Sets extract.cmd to: lzma
     630.br
     631.Sy Type:
     632.Em optional
     633.br
     634.Sy Example:
     635.Dl use_lzma yes
    624636.It Ic dist_subdir
    625637Create a sub-directory in
  • branches/variant-descs-14482/base/doc/portgroup.7

    r28465 r40953  
    143143.br
    144144.Sy Default:
    145 .Em /Library/Frameworks
     145.Em ${prefix}/Library/Frameworks
    146146or
    147 .Em /Application/MacPorts depending on xcode.destroot.type
     147.Em /Applications/MacPorts depending on xcode.destroot.type
    148148.br
    149149.It Ic xcode.destroot.settings
  • branches/variant-descs-14482/base/doc/porthier.7

    r27889 r40953  
    5454.It Pa libexec/
    5555system daemons & system utilities (executed by other programs)
     56.It Pa Library/Frameworks/
     57Native Mac OS X Library Frameworks
    5658.It Pa sbin/
    5759system programs and administration utilities
     
    128130.It Pa /Applications/MacPorts/
    129131Native Mac OS X applications
    130 .It Pa /Library/Frameworks/
    131 Native Mac OS X Library Frameworks
    132132.Pp
    133133.El
  • branches/variant-descs-14482/base/m4/foundation.m4

    r33760 r40953  
    308308
    309309                # Set NeXT LIBS and CFLAGS
    310                 APPLE_FOUNDATION_CFLAGS="-framework Foundation"
     310                APPLE_FOUNDATION_CFLAGS=""
    311311                APPLE_FOUNDATION_LIBS="-framework Foundation"
    312312
  • branches/variant-descs-14482/base/portmgr/dmg/postflight

    r38100 r40953  
    4343SBINPATH=${PREFIX}/sbin
    4444MANPAGES=${PREFIX}/share/man
     45TCLSH=/usr/bin/tclsh
     46TCL_PACKAGE_DIR=/Library/Tcl
    4547TIMESTAMP=$(date +"%Y-%m-%d_at_%H:%M:%S")
    4648BACKUP_SUFFIX=macports-saved_${TIMESTAMP}
     
    5759        echo "Successful!"
    5860    fi
     61   
     62    # Remove any duplicates from the dep map (could occur with 1.6 and earlier)
     63    ${TCLSH} dep_map_clean.tcl ${TCL_PACKAGE_DIR}
    5964}
    6065
  • branches/variant-descs-14482/base/portmgr/jobs/GuideRegen.sh

    r33314 r40953  
    1212LOCKFILE=/tmp/.mp_svn_guide_regen.lock
    1313# ROOT directory, where everything is. This needs to exist!
    14 ROOT=/opt/mp_guide_regen
     14ROOT=/var/tmp/macports/
    1515# e-mail address to spam in case of failure.
    1616SPAM_LOVERS=macports-dev@lists.macosforge.org,markd@macports.org,wsiegrist@apple.com
     
    6262fi
    6363
    64 # (re)build
     64# build single html version
    6565{ cd ${SRCTREE}/doc-new && $MAKE guide > $FAILURE_LOG 2>&1 ; } \
     66    || { echo "make failed." >> $FAILURE_LOG ; bail ; }
     67
     68# build chunked version
     69{ cd ${SRCTREE}/doc-new && $MAKE guide-chunked > $FAILURE_LOG 2>&1 ; } \
    6670    || { echo "make failed." >> $FAILURE_LOG ; bail ; }
    6771
  • branches/variant-descs-14482/base/portmgr/jobs/PortIndex2MySQL.tcl

    r37509 r40953  
    235235# Do we need any other?
    236236puts $sqlfile_fd "DROP TABLE IF EXISTS log;"
    237 puts $sqlfile_fd "CREATE TABLE log (activity VARCHAR(255), activity_time TIMESTAMP(14));"
     237puts $sqlfile_fd "CREATE TABLE log (activity VARCHAR(255), activity_time TIMESTAMP(14)) DEFAULT CHARSET=utf8;"
    238238
    239239puts $sqlfile_fd "DROP TABLE IF EXISTS portfiles;"
    240 puts $sqlfile_fd "CREATE TABLE portfiles (name VARCHAR(255) PRIMARY KEY NOT NULL, path VARCHAR(255), version VARCHAR(255),  description TEXT);"
     240puts $sqlfile_fd "CREATE TABLE portfiles (name VARCHAR(255) PRIMARY KEY NOT NULL, path VARCHAR(255), version VARCHAR(255),  description TEXT) DEFAULT CHARSET=utf8;"
    241241
    242242puts $sqlfile_fd "DROP TABLE IF EXISTS categories;"
    243 puts $sqlfile_fd "CREATE TABLE categories (portfile VARCHAR(255), category VARCHAR(255), is_primary INTEGER);"
     243puts $sqlfile_fd "CREATE TABLE categories (portfile VARCHAR(255), category VARCHAR(255), is_primary INTEGER) DEFAULT CHARSET=utf8;"
    244244
    245245puts $sqlfile_fd "DROP TABLE IF EXISTS maintainers;"
    246 puts $sqlfile_fd "CREATE TABLE maintainers (portfile VARCHAR(255), maintainer VARCHAR(255), is_primary INTEGER);"
     246puts $sqlfile_fd "CREATE TABLE maintainers (portfile VARCHAR(255), maintainer VARCHAR(255), is_primary INTEGER) DEFAULT CHARSET=utf8;"
    247247
    248248puts $sqlfile_fd "DROP TABLE IF EXISTS dependencies;"
    249 puts $sqlfile_fd "CREATE TABLE dependencies (portfile VARCHAR(255), library VARCHAR(255));"
     249puts $sqlfile_fd "CREATE TABLE dependencies (portfile VARCHAR(255), library VARCHAR(255)) DEFAULT CHARSET=utf8;"
    250250
    251251puts $sqlfile_fd "DROP TABLE IF EXISTS variants;"
    252 puts $sqlfile_fd "CREATE TABLE variants (portfile VARCHAR(255), variant VARCHAR(255));"
     252puts $sqlfile_fd "CREATE TABLE variants (portfile VARCHAR(255), variant VARCHAR(255)) DEFAULT CHARSET=utf8;"
    253253
    254254puts $sqlfile_fd "DROP TABLE IF EXISTS platforms;"
    255 puts $sqlfile_fd "CREATE TABLE platforms (portfile VARCHAR(255), platform VARCHAR(255));"
     255puts $sqlfile_fd "CREATE TABLE platforms (portfile VARCHAR(255), platform VARCHAR(255)) DEFAULT CHARSET=utf8;"
    256256
    257257
  • branches/variant-descs-14482/base/portmgr/jobs/PortIndexRegen.sh

    r38100 r40953  
    4848}
    4949
    50 # Cleanup fuction for runtime files.
     50# Cleanup function for runtime files.
    5151cleanup () {
    5252    rm -f $COMMIT_MSG $FAILURE_LOG
  • branches/variant-descs-14482/base/portmgr/jobs/mprsyncup

    r31823 r40953  
    5959    ${SVN} checkout ${SVNURL}/trunk/base ${TBASE}
    6060fi
     61
     62# Delete old exports if they exist
     63if [ -d ${TBASE}-export ]; then
     64    $RM -rf ${TBASE}-export;
     65fi
    6166${SVN} export ${TBASE} ${TBASE}-export
     67
    6268if [ ! -d ${RSYNCROOT}/trunk/base ]; then
    6369    ${MKDIR} -p ${RSYNCROOT}/trunk
     
    7783    ${SVN} checkout ${RELEASE_URL} ${RBASE}
    7884fi
     85
     86# Delete old exports if they exist
     87if [ -d ${RBASE}-export ]; then
     88    $RM -rf ${RBASE}-export;
     89fi
    7990${SVN} export ${RBASE} ${RBASE}-export
     91
    8092if [ ! -d ${RSYNCROOT}/release/base ]; then
    8193    ${MKDIR} -p ${RSYNCROOT}/release/base
     
    90102    ${SVN} checkout ${SVNURL}/trunk/dports ${PORTS}
    91103fi
     104
     105# Delete old exports if they exist
     106if [ -d ${PORTS}-export ]; then
     107    $RM -rf ${PORTS}-export;
     108fi
    92109${SVN} export ${PORTS} ${PORTS}-export
     110
    93111if [ ! -d ${RSYNCROOT}/release/ports ]; then
    94112    ${MKDIR} -p ${RSYNCROOT}/release/ports
  • branches/variant-descs-14482/base/src/darwintracelib1.0/darwintrace.c

    r30381 r40953  
    321321{
    322322        filemap=exchange_with_port("filemap\t", sizeof("filemap\t"), 1, 0);
    323         if((int)filemap==-1)
     323        if(filemap==(char*)-1)
    324324                filemap=0;
    325325}
     
    340340                                __darwintrace_fd=sock;
    341341                                ask_for_filemap();
    342                         }else dprintf("connect failed %d :-(\n", errno);
     342                        } else {
     343                                dprintf("connect failed %d :-(\n", errno);
     344                        }
    343345                        errno = olderrno;
    344346                }
     
    474476        strcpy(buffer+10, path);
    475477        p=exchange_with_port(buffer, strlen(buffer)+1, 1, 0);
    476         if((int)p==-1||!p)
     478        if(p==(char*)-1||!p)
    477479                return 0;
    478480       
  • branches/variant-descs-14482/base/src/macports1.0/macports.tcl

    r38100 r40953  
    7777#     no message.
    7878# if these functions are not provided, defaults are used.
     79# Clients of the library may optionally provide ui_init with the following
     80# prototype.
     81#     proc ui_init {priority prefix channels message}
     82# ui_init needs to correctly define the proc ::ui_$priority {message} or throw
     83# an error.
     84# if this function is not provided or throws an error, default procedures for
     85# ui_$priority are defined.
    7986
    8087# ui_options accessor
     
    119126        }
    120127
    121         if {$nbchans == 1} {
    122             set chan [lindex $channels 0]
    123             proc ::ui_$priority {str} [subst { puts $chan "$prefix\$str" }]
    124         } else {
    125             proc ::ui_$priority {str} [subst {
    126                 foreach chan \$channels {
    127                     puts $chan "$prefix\$str"
    128                 }
    129             }]
     128        try {
     129            ::ui_init $priority $prefix $channels $message
     130        } catch * {
     131            if {$nbchans == 1} {
     132                set chan [lindex $channels 0]
     133                proc ::ui_$priority {str} [subst { puts $chan "$prefix\$str" }]
     134            } else {
     135                proc ::ui_$priority {str} [subst {
     136                    foreach chan \$channels {
     137                        puts $chan "$prefix\$str"
     138                    }
     139                }]
     140            }
    130141        }
    131142
     
    359370    # Configure the search path for configuration files
    360371    set conf_files ""
     372    lappend conf_files "${macports_conf_path}/macports.conf"
     373    if { [file isdirectory $macports_user_dir] } {
     374        lappend conf_files "${macports_user_dir}/macports.conf"
     375    }
    361376    if {[info exists env(PORTSRC)]} {
    362377        set PORTSRC $env(PORTSRC)
    363378        lappend conf_files ${PORTSRC}
    364379    }
    365     if { [file isdirectory $macports_user_dir] } {
    366         lappend conf_files "${macports_user_dir}/macports.conf"
    367     }
    368     lappend conf_files "${macports_conf_path}/macports.conf"
    369380   
    370381    # Process the first configuration file we find on conf_files list
     
    381392                }
    382393            }           
    383             break
    384394        }
    385395    }
     
    687697        return -code error "Library directory '$libpath' must exist"
    688698    }
     699
     700    # unset environment an extra time, to work around bugs in Leopard Tcl
     701    foreach envkey [array names env] {
     702        if {[lsearch $keepenvkeys $envkey] == -1} {
     703            unsetenv $envkey
     704        }
     705    }
    689706}
    690707
     
    10651082    set depline [lindex [split $depspec :] 1]
    10661083    set prefix [_mportkey $mport prefix]
     1084    set frameworks_dir [_mportkey $mport frameworks_dir]
     1085    set x11prefix [_mportkey $mport x11prefix]
    10671086   
    10681087    if {[info exists env(DYLD_FRAMEWORK_PATH)]} {
    10691088        lappend search_path $env(DYLD_FRAMEWORK_PATH)
    10701089    } else {
    1071         lappend search_path /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks
     1090        lappend search_path ${frameworks_dir} /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks
    10721091    }
    10731092    if {[info exists env(DYLD_FALLBACK_FRAMEWORK_PATH)]} {
     
    10771096        lappend search_path $env(DYLD_LIBRARY_PATH)
    10781097    }
    1079     lappend search_path /lib /usr/lib /usr/X11R6/lib /usr/X11/lib ${prefix}/lib
     1098    lappend search_path /lib /usr/lib ${x11prefix}/lib ${prefix}/lib
    10801099    if {[info exists env(DYLD_FALLBACK_LIBRARY_PATH)]} {
    10811100        lappend search_path $env(DYLD_FALLBACK_LIBRARY_PATH)
  • branches/variant-descs-14482/base/src/package1.0/portunarchive.tcl

    r37509 r40953  
    230230                                set unarchive.cmd "$xar"
    231231                                set unarchive.pre_args {-xvpf}
    232                                 set unarchive.args "${unarchive.path} ."
     232                                set unarchive.args "${unarchive.path}"
    233233                        } else {
    234234                                ui_debug $errmsg
  • branches/variant-descs-14482/base/src/pextlib1.0/Makefile

    r27297 r40953  
    22                fs-traverse.o strcasecmp.o vercomp.o filemap.o \
    33                sha1cmd.o compat.o curl.o rmd160cmd.o readline.o uid.o\
    4                 tracelib.o
     4                tracelib.o tty.o
    55SHLIB_NAME=     Pextlib${SHLIB_SUFFIX}
    66INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/pextlib1.0
    7 export MACOSX_DEPLOYMENT_TARGET=10.3
    87
    98include ../../Mk/macports.autoconf.mk
  • branches/variant-descs-14482/base/src/pextlib1.0/Pextlib.c

    r38100 r40953  
    3737#endif
    3838
     39#include <stdint.h>
    3940#include <stdio.h>
    4041#include <stdlib.h>
     
    115116#include "uid.h"
    116117#include "tracelib.h"
     118#include "tty.h"
    117119
    118120#if HAVE_CRT_EXTERNS_H
     
    537539                return TCL_ERROR;
    538540        }
    539         fd = (int) handle;
     541        fd = (int)(intptr_t)handle;
    540542
    541543        for (i = 2; i < objc; i++) {
     
    773775        }
    774776
    775         theChannel = Tcl_MakeFileChannel((ClientData) fd, readOrWrite);
     777        theChannel = Tcl_MakeFileChannel((ClientData)(intptr_t)fd, readOrWrite);
    776778        if (theChannel == NULL) {
    777779                return TCL_ERROR;
     
    832834        }
    833835
    834         channel = Tcl_MakeFileChannel((ClientData) fd, TCL_READABLE|TCL_WRITABLE);
     836        channel = Tcl_MakeFileChannel((ClientData)(intptr_t)fd, TCL_READABLE|TCL_WRITABLE);
    835837        Tcl_RegisterChannel(interp, channel);
    836838        channelname = (char *)Tcl_GetChannelName(channel);
     
    12151217       
    12161218        Tcl_CreateObjCommand(interp, "tracelib", TracelibCmd, NULL, NULL);
     1219        Tcl_CreateObjCommand(interp, "isatty", IsattyCmd, NULL, NULL);
     1220        Tcl_CreateObjCommand(interp, "term_get_size", TermGetSizeCmd, NULL, NULL);
    12171221
    12181222        if (Tcl_PkgProvide(interp, "Pextlib", "1.0") != TCL_OK)
  • branches/variant-descs-14482/base/src/pextlib1.0/filemap.c

    r38100 r40953  
    768768                /* one char too far */
    769769                endCursor--;
    770                 partLength = (int) endCursor - (int) beginCursor;
     770                partLength = endCursor - beginCursor;
    771771
    772772                /* do we have a node for this entry? */
     
    908908                /* one char too far */
    909909                endCursor--;
    910                 partLength = (int) endCursor - (int) beginCursor;
     910                partLength = endCursor - beginCursor;
    911911
    912912                /* do we have a node for this entry? */
     
    11071107                /* one char too far */
    11081108                endCursor--;
    1109                 partLength = (int) endCursor - (int) beginCursor;
     1109                partLength = endCursor - beginCursor;
    11101110
    11111111                /* do we have a node for this entry? */
  • branches/variant-descs-14482/base/src/pextlib1.0/readline.c

    r26177 r40953  
    163163        char* action;
    164164        Tcl_Obj *tcl_result;
     165#if HAVE_LIBREADLINE
    165166        int argbase;
    166167        int argcnt;
     168#endif
    167169       
    168170        /* Get the action */
     
    277279{
    278280        char* action = NULL;
     281#if HAVE_LIBREADLINE
    279282        char* s = NULL;
    280283        int i = 0;
    281284        Tcl_Obj *tcl_result;
     285#endif
    282286
    283287        if (objc < 2) {
  • branches/variant-descs-14482/base/src/port/port.tcl

    r38100 r40953  
    4242    [file join "@TCL_PACKAGE_DIR@" macports1.0 macports_fastload.tcl]}
    4343package require macports
     44package require Pextlib 1.0
    4445
    4546
     
    401402##
    402403# Makes sure we get the current terminal size
    403 proc set_term_size {} {
     404proc term_init_size {} {
    404405    global env
    405406
    406407    if {![info exists env(COLUMNS)] || ![info exists env(LINES)]} {
    407         if {![catch {exec stty size} err]} {
    408             regexp {(\d+) (\d+)} $err -> rows cols
    409             set env(COLUMNS) $cols
    410             set env(LINES) $rows
     408        if {[isatty stdout]} {
     409            set size [term_get_size stdout]
     410
     411            if {![info exists env(LINES)]} {
     412                set env(LINES) [lindex $size 0]
     413            }
     414
     415            if {![info exists env(COLUMNS)]} {
     416                set env(COLUMNS) [lindex $size 1]
     417            }
    411418        }
    412419    }
     
    19952002        array unset portinfo
    19962003        array set portinfo [lindex $result 1]
     2004        if {[catch {set mport [mportopen $portinfo(porturl) [array get options] [array get variations]]} result]} {
     2005           ui_debug "$::errorInfo"
     2006           break_softcontinue "Unable to open port: $result" 1 status
     2007        }
     2008        array unset portinfo
     2009        array set portinfo [mportinfo $mport]
     2010        mportclose $mport
    19972011        # set portname again since the one we were passed may not have had the correct case
    19982012        set portname $portinfo(name)
     
    23002314                    set f [open $portfile RDONLY]
    23012315                    while { ![eof $f] } {
    2302                         puts [read $f 4096]
     2316                        puts -nonewline [read $f 4096]
    23032317                    }
    23042318                    close $f
     
    23122326                    # may want stuff from it as well, like TERM.
    23132327                    array unset env_save; array set env_save [array get env]
    2314                     array unset env *; array set env [array get boot_env]
     2328                    array unset env *; unsetenv *; array set env [array get boot_env]
    23152329                   
    23162330                    # Find an editor to edit the portfile
    23172331                    set editor ""
    23182332                    if {[info exists local_options(ports_edit_editor)]} {
    2319                         set editor $local_options(ports_edit_editor)
     2333                        set editor [join $local_options(ports_edit_editor)]
    23202334                    } elseif {[info exists local_options(ports_ed_editor)]} {
    2321                         set editor $local_options(ports_ed_editor)
     2335                        set editor [join $local_options(ports_ed_editor)]
    23222336                    } else {
    23232337                        foreach ed { VISUAL EDITOR } {
     
    23382352                   
    23392353                    # Restore internal MacPorts environment
    2340                     array unset env *; array set env [array get env_save]
     2354                    array unset env *; unsetenv *; array set env [array get env_save]
    23412355                }
    23422356
     
    23712385
    23722386                gohome {
    2373                     # Get the homepage for the port by opening the portfile
    2374                     if {![catch {set ctx [mportopen $porturl]} result]} {
     2387                    set homepage ""
     2388
     2389                    # Get the homepage as read from PortIndex
     2390                    if {[info exists portinfo(homepage)]} {
     2391                        set homepage $portinfo(homepage)
     2392                    }
     2393
     2394                    # If not available, get the homepage for the port by opening the Portfile
     2395                    if {$homepage == "" && ![catch {set ctx [mportopen $porturl]} result]} {
    23752396                        array set portinfo [mportinfo $ctx]
    2376                         set homepage $portinfo(homepage)
     2397                        if {[info exists portinfo(homepage)]} {
     2398                            set homepage $portinfo(homepage)
     2399                        }
    23772400                        mportclose $ctx
    23782401                    }
    23792402
    23802403                    # Try to open a browser to the homepage for the given port
    2381                     set homepage $portinfo(homepage)
    23822404                    if { $homepage != "" } {
    2383                         system "${macports::autoconf::open_path} $homepage"
     2405                        system "${macports::autoconf::open_path} '$homepage'"
    23842406                    } else {
    2385                         puts "(no homepage)"
     2407                        ui_error [format "No homepage for %s" $portname]
    23862408                    }
    23872409                }
     
    31443166# Make sure we get the size of the terminal
    31453167# We do this here to save it in the boot_env, in case we determined it manually
    3146 set_term_size
     3168term_init_size
    31473169
    31483170# Save off a copy of the environment before mportinit monkeys with it
     
    31703192
    31713193# Parse global options that will affect all subsequent commands
    3172 parse_options "global" ui_options global_options
     3194if {[catch {parse_options "global" ui_options global_options} result]} {
     3195    puts "Error: $result"
     3196    print_usage
     3197    exit 1
     3198}
    31733199
    31743200# Get arguments remaining after option processing
  • branches/variant-descs-14482/base/src/port1.0/portbuild.tcl

    r37509 r40953  
    101101
    102102proc build_getnicevalue {args} {
    103     if {![exists build.nice]} {
     103    if {![exists build.nice] || [string match "* *" [option build.cmd]]} {
    104104        return ""
    105105    }
     
    119119    ui_debug "port allows a parallel build"
    120120
    121     if {![exists build.jobs] || ![string match "*make*" [option build.cmd]]} {
     121    if {![exists build.jobs] || !([string match "*make*" [option build.cmd]] || [string match "*scons*" [option build.cmd]])} {
    122122        return ""
    123123    }
     
    136136    global UI_PREFIX
    137137   
    138     if {[string length [option build.target]]} {
    139         ui_msg "$UI_PREFIX [format [msgcat::mc "Building %s with target %s"] [option portname] [option build.target]]"
    140     } else {
    141         ui_msg "$UI_PREFIX [format [msgcat::mc "Building %s"] [option portname]]"
    142     }
     138    ui_msg "$UI_PREFIX [format [msgcat::mc "Building %s"] [option portname]]"
    143139}
    144140
  • branches/variant-descs-14482/base/src/port1.0/portconfigure.tcl

    r37509 r40953  
    4141
    4242# define options
    43 commands configure automake autoconf xmkmf libtool
     43commands configure autoreconf automake autoconf xmkmf libtool
    4444# defaults
    4545default configure.env       ""
     
    4747default configure.cmd       ./configure
    4848default configure.dir       {${worksrcpath}}
     49default autoreconf.dir      {${worksrcpath}}
     50default autoreconf.pre_args {--install}
    4951default autoconf.dir        {${worksrcpath}}
    5052default automake.dir        {${worksrcpath}}
     
    260262proc configure_main {args} {
    261263    global [info globals]
    262     global worksrcpath use_configure use_autoconf use_automake use_xmkmf
     264    global worksrcpath use_configure use_autoreconf use_autoconf use_automake use_xmkmf
    263265    global configure.env configure.pipe configure.cflags configure.cppflags configure.cxxflags configure.objcflags configure.ldflags configure.libs configure.fflags configure.f90flags configure.fcflags configure.classpath
    264266    global configure.perl configure.python configure.ruby configure.install configure.awk configure.bison configure.pkg_config configure.pkg_config_path
    265267    global configure.ccache configure.distcc configure.cc configure.cxx configure.cpp configure.objc configure.f77 configure.f90 configure.fc configure.javac configure.compiler prefix
    266268    global os.platform os.major
     269   
     270    if {[tbool use_autoreconf]} {
     271        # XXX depend on autoreconf
     272        if {[catch {command_exec autoreconf} result]} {
     273            return -code error "[format [msgcat::mc "%s failure: %s"] autoreconf $result]"
     274        }
     275    }
    267276   
    268277    if {[tbool use_automake]} {
     
    286295            "darwin 8" { set configure.compiler gcc-4.0 }
    287296            "darwin 9" { set configure.compiler gcc-4.0 }
     297            "darwin 10" { set configure.compiler llvm-gcc-4.2 }
    288298        }
    289299    }
     
    309319                cxx /usr/bin/g++-4.2 \
    310320                cpp /usr/bin/cpp-4.2 }
     321        llvm-gcc-4.2 {
     322            select_compiler "Mac OS X llvm-gcc 4.2" \
     323                cc  /Developer/usr/llvm-gcc-4.2/bin/llvm-gcc-4.2 \
     324                objc /Developer/usr/llvm-gcc-4.2/bin/llvm-gcc-4.2 \
     325                cxx /Developer/usr/llvm-gcc-4.2/bin/llvm-g++-4.2 \
     326                cpp /Developer/usr/llvm-gcc-4.2/bin/llvm-cpp-4.2 }
    311327        apple-gcc-3.3 {
    312328            select_compiler "MacPorts Apple gcc 3.3" \
     
    374390                f90 ${prefix}/bin/gfortran-mp-4.4 }
    375391        default {
    376             ui_debug "No compiler collection selected explicitly" }
     392            return -code error "Invalid value for configure.compiler" }
    377393    }
    378394   
  • branches/variant-descs-14482/base/src/port1.0/portextract.tcl

    r38100 r40953  
    5959
    6060proc extract_init {args} {
    61     global extract.only extract.dir extract.cmd extract.pre_args extract.post_args extract.mkdir distfiles use_bzip2 use_zip use_dmg workpath
     61    global extract.only extract.dir extract.cmd extract.pre_args extract.post_args extract.mkdir distfiles use_bzip2 use_lzma use_zip use_dmg workpath
    6262
    6363    # should the distfiles be extracted to worksrcpath instead?
     
    7171    if {[tbool use_bzip2]} {
    7272        option extract.cmd [binaryInPath "bzip2"]
     73    } elseif {[tbool use_lzma]} {
     74        option extract.cmd [binaryInPath "lzma"]
    7375    } elseif {[tbool use_zip]} {
    7476        option extract.cmd [binaryInPath "unzip"]
  • branches/variant-descs-14482/base/src/port1.0/portfetch.tcl

    r38100 r40953  
    4747        cvs.module cvs.root cvs.password cvs.date cvs.tag \
    4848        svn.url svn.tag \
    49         git.url git.branch
     49        git.url git.branch \
     50        hg.url hg.tag
    5051       
    5152# XXX we use the command framework to buy us some useful features,
     
    8081default git.branch {}
    8182
     83default hg.dir {${workpath}}
     84default hg.tag {tip}
     85
    8286# Set distfiles
    8387default distfiles {[suffix $distname]}
     
    101105# Option-executed procedures
    102106option_proc use_bzip2 fix_extract_suffix
     107option_proc use_lzma fix_extract_suffix
    103108option_proc use_zip fix_extract_suffix
    104109option_proc use_dmg fix_extract_suffix
     
    111116                set extract.suffix .tar.bz2
    112117            }
     118            use_lzma {
     119                set extract.suffix .tar.lzma
     120            }
    113121            use_zip {
    114122                set extract.suffix .zip
     
    133141        cvs                     -
    134142        svn                     -
    135         git                     { return "" }
     143        git                     -
     144        hg                      { return "" }
    136145        standard        -
    137146        default         { return "${distname}${extract.suffix}" }
     
    362371            }
    363372            if { ![info exists seen($host)] } {
    364                 set seen($host) yes
    365                 lappend hosts $host
    366                 ui_debug "Pinging $host..."
    367                 set fds($host) [open "|ping -noq -c3 -t3 $host | grep round-trip | cut -d / -f 5"]
     373                if {[catch {set fds($host) [open "|ping -noq -c3 -t3 $host | grep round-trip | cut -d / -f 5"]}]} {
     374                    ui_debug "Spawning ping for $host failed"
     375                    # will end up after all hosts that were pinged OK but before those that didn't respond
     376                    set pingtimes($host) 5000
     377                } else {
     378                    ui_debug "Pinging $host..."
     379                    set seen($host) yes
     380                    lappend hosts $host
     381                }
    368382            }
    369383        }
     
    530544}
    531545
     546# Perform a mercurial fetch.
     547proc hgfetch {args} {
     548    global worksrcpath prefix_frozen
     549    global hg.url hg.tag
     550
     551    # Look for the hg command.
     552    set hg.cmd {}
     553    foreach hgcmd "$prefix_frozen/bin/hg hg" {
     554        if {[file executable $hgcmd]} {
     555            set hg.cmd $hgcmd
     556            break
     557        }
     558    }
     559    if {${hg.cmd} == {}} {
     560        ui_error "hg is required to fetch ${hg.url}"
     561        ui_error "Please install the mercurial port before proceeding."
     562        return -code error [msgcat::mc "Mercurial command not found"]
     563    }
     564
     565    set cmdstring "${hg.cmd} clone --rev ${hg.tag} ${hg.url} ${worksrcpath} 2>&1"
     566    ui_debug "Executing: $cmdstring"
     567    if {[catch {system $cmdstring} result]} {
     568        return -code error [msgcat::mc "Mercurial clone failed"]
     569    }
     570
     571    if {[info exists patchfiles]} {
     572        return [fetchfiles]
     573    }
     574
     575    return 0
     576}
     577
    532578# Perform a standard fetch, assembling fetch urls from
    533 # the listed url varable and associated distfile
     579# the listed url variable and associated distfile
    534580proc fetchfiles {args} {
    535581        global distpath all_dist_files UI_PREFIX fetch_urls
     
    663709    global distname distpath all_dist_files fetch.type
    664710
    665     # Check for files, download if neccesary
     711    # Check for files, download if necessary
    666712    if {![info exists all_dist_files] && "${fetch.type}" == "standard"} {
    667713        return 0
     
    673719        svn             { return [svnfetch] }
    674720        git             { return [gitfetch] }
     721        hg              { return [hgfetch] }
    675722        standard -
    676723        default { return [fetchfiles] }
  • branches/variant-descs-14482/base/src/port1.0/portlint.tcl

    r38100 r40953  
    4040        "editors" \
    4141        "emulators" \
     42        "erlang" \
     43        "finance" \
    4244        "fuse" \
    4345        "games" \
    4446        "genealogy" \
     47        "gis" \
    4548        "gnome" \
    4649        "gnustep" \
     
    5659        "net" \
    5760        "news" \
     61        "office" \
    5862        "palm" \
    5963        "perl" \
  • branches/variant-descs-14482/base/src/port1.0/portmain.tcl

    r37509 r40953  
    6161default x11prefix /usr/X11R6
    6262default applications_dir /Applications/MacPorts
    63 default frameworks_dir /Library/Frameworks
     63default frameworks_dir {${prefix}/Library/Frameworks}
    6464default destdir destroot
    6565default destpath {${workpath}/${destdir}}
  • branches/variant-descs-14482/base/src/port1.0/portstartupitem.tcl

    r31771 r40953  
    557557   
    558558    puts ${plist} "<?xml version='1.0' encoding='UTF-8'?>"
    559     puts ${plist} "<!DOCTYPE plist PUBLIC -//Apple Computer//DTD PLIST 1.0//EN"
    560     puts ${plist} "http://www.apple.com/DTDs/PropertyList-1.0.dtd >"
     559    puts ${plist} "<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\""
     560    puts ${plist} "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\" >"
    561561    puts ${plist} "<plist version='1.0'>"
    562562    puts ${plist} "<dict>"
  • branches/variant-descs-14482/base/src/port1.0/portutil.tcl

    r37512 r40953  
    330330    }
    331331    if {[option macosx_deployment_target] ne ""} {
    332         set ${command}.env_array("MACOSX_DEPLOYMENT_TARGET") [option macosx_deployment_target]
     332        set ${command}.env_array(MACOSX_DEPLOYMENT_TARGET) [option macosx_deployment_target]
    333333    }
    334334   
     
    606606   
    607607    foreach arg $args {
    608         if {[regexp {(^[0-9]$)} $arg match result]} {
     608        if {[regexp {(^[0-9]+$)} $arg match result]} {
    609609            set release $result
    610610        } elseif {[regexp {([a-zA-Z0-9]*)} $arg match result]} {
  • branches/variant-descs-14482/base/src/port1.0/resources/fetch/mirror_sites.tcl

    r38100 r40953  
    9595    http://mirrors.kernel.org/gnu/
    9696    http://www.mirrorservice.org/sites/ftp.gnu.org/gnu/
    97     ftp://ftp.uu.net/archive/systems/gnu/
    9897    ftp://ftp.funet.fi/pub/gnu/prep/
    9998    ftp://ftp.kddlabs.co.jp/pub/gnu/gnu/
     
    259258set portfetch::mirror_sites::sites(sourceforge) {
    260259    http://downloads.sourceforge.net/
    261     http://internode.dl.sourceforge.net/
    262260    http://easynews.dl.sourceforge.net/
    263     http://ufpr.dl.sourceforge.net/
    264     http://kent.dl.sourceforge.net/
    265     http://jaist.dl.sourceforge.net/
    266     http://optusnet.dl.sourceforge.net/
    267     http://nchc.dl.sourceforge.net/
    268     http://switch.dl.sourceforge.net/
    269     http://puzzle.dl.sourceforge.net/
    270     http://garr.dl.sourceforge.net/
    271     http://surfnet.dl.sourceforge.net/
    272261    http://internap.dl.sourceforge.net/
    273262    http://superb-east.dl.sourceforge.net/
    274263    http://superb-west.dl.sourceforge.net/
     264    http://voxel.dl.sourceforge.net/
     265    http://ufpr.dl.sourceforge.net/
     266    http://dfn.dl.sourceforge.net/
     267    http://garr.dl.sourceforge.net/
     268    http://heanet.dl.sourceforge.net/
     269    http://kent.dl.sourceforge.net/
     270    http://mesh.dl.sourceforge.net/
     271    http://puzzle.dl.sourceforge.net/
     272    http://surfnet.dl.sourceforge.net/
     273    http://switch.dl.sourceforge.net/
     274    http://nchc.dl.sourceforge.net/
     275    http://jaist.dl.sourceforge.net/
     276    http://internode.dl.sourceforge.net/
     277    http://transact.dl.sourceforge.net/
     278    http://optusnet.dl.sourceforge.net/
    275279}
    276280
  • branches/variant-descs-14482/base/src/port1.0/resources/group/Makefile

    r28463 r40953  
    1313
    1414test:
     15        ${TCLSH} tests/ruby-1.0.tcl
    1516
    1617install:
  • branches/variant-descs-14482/base/src/port1.0/resources/group/gnustep-1.0.tcl

    r28796 r40953  
    6767#
    6868#
    69 # default gnustep.cc            CC=gcc-dp-4.2
     69# default gnustep.cc            CC=gcc-mp-4.2
    7070#
    7171# default use_configure         no
  • branches/variant-descs-14482/base/src/port1.0/resources/group/python24-1.0.tcl

    r37509 r40953  
    3535set python.bin  ${prefix}/bin/python2.4
    3636set python.lib  ${prefix}/lib/libpython2.4.dylib
    37 set python.libdir ${prefix}/Library/Frameworks/Python.framework/Versions/2.4/lib/python2.4
     37set python.libdir ${frameworks_dir}/Python.framework/Versions/2.4/lib/python2.4
    3838set python.pkgd ${prefix}/lib/python2.4/site-packages
    39 set python.include      ${prefix}/Library/Frameworks/Python.framework/Versions/2.4/include/python2.4
     39set python.include      ${frameworks_dir}/Python.framework/Versions/2.4/include/python2.4
    4040
    4141categories              python
  • branches/variant-descs-14482/base/src/port1.0/resources/group/python30-1.0.tcl

    r37509 r40953  
    3333#
    3434
    35 set prefix ${prefix}/Library/Frameworks/Python.framework/Versions/3.0
     35set prefix ${frameworks_dir}/Python.framework/Versions/3.0
    3636
    3737set python.bin  ${prefix}/bin/python3.0
  • branches/variant-descs-14482/base/src/port1.0/resources/group/ruby-1.0.tcl

    r37509 r40953  
    3232# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    3333# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    34 #
    35 # Set some variables.
    36 set ruby.bin    ${prefix}/bin/ruby
    37 set ruby.rdoc   ${prefix}/bin/rdoc
     34
     35# Define these variables assuming ruby1.8 to make them accessible in
     36# the portfile after port group declaration. They can be modified by
     37# ruby.setup, e.g. to use another ruby than 1.8.
     38set ruby.bin            ${prefix}/bin/ruby
     39set ruby.rdoc           ${prefix}/bin/rdoc
     40set ruby.gem            ${prefix}/bin/gem
    3841
    3942proc ruby.extract_config {var {default ""}} {
     
    5255set ruby.archlib        [ruby.extract_config vendorarchdir ${ruby.lib}/${ruby.arch}]
    5356
    54 # define these empty initially, they are set by ruby.setup arguments
    5557set ruby.module         ""
    5658set ruby.filename       ""
     
    5961set ruby.srcdir         ""
    6062
    61 # ruby group setup procedure
    62 proc ruby.setup {module vers {type "install.rb"} {docs {}} {source "custom"}} {
    63         global destroot prefix worksrcpath
    64         global ruby.bin ruby.lib
    65         global ruby.module ruby.project ruby.filename ruby.docs ruby.srcdir
     63# ruby group setup procedure; optional for ruby 1.8 if you want only
     64# basic variables, like ruby.lib and ruby.archlib.
     65proc ruby.setup {module vers {type "install.rb"} {docs {}} {source "custom"} {implementation "ruby"}} {
     66        global destroot prefix worksrcpath os.platform
     67        global ruby.bin ruby.rdoc ruby.gem
     68        global ruby.version
     69        global ruby.lib ruby.archlib
     70        global ruby.module ruby.filename ruby.project ruby.docs ruby.srcdir
     71
     72        if {${implementation} eq "ruby19"} {
     73                set ruby.bin    ${prefix}/bin/ruby1.9
     74                set ruby.rdoc   ${prefix}/bin/rdoc1.9
     75                set ruby.gem    ${prefix}/bin/gem1.9
     76                set ruby.port_prefix rb19
     77        } elseif {${implementation} eq "ruby"} {
     78                # ruby.bin, ruby.rdoc, and ruby.gem set to 1.8 by default
     79                set ruby.port_prefix rb
     80        } else {
     81                ui_error "ruby.setup: unknown implementation '${implementation}' specified (ruby, ruby19 possible)"
     82                return -code error "ruby.setup failed"
     83        }
     84
     85        # re-define variables to pick up possible implemantation change
     86        set ruby.version        [ruby.extract_config ruby_version]
     87        set ruby.arch           [ruby.extract_config arch ${os.platform}]
     88        set ruby.lib            [ruby.extract_config vendorlibdir ${prefix}/lib/ruby/vendor_ruby/${ruby.version}]
     89        set ruby.archlib        [ruby.extract_config vendorarchdir ${ruby.lib}/${ruby.arch}]
    6690
    6791        # define ruby global names and lists
     
    81105        set ruby.docs   ${docs}
    82106
    83         name                    rb-[string tolower ${ruby.module}]
     107        name                    ${ruby.port_prefix}-[string tolower ${ruby.module}]
    84108        version                 ${vers}
    85109        categories              ruby
     
    132156        dist_subdir             ruby
    133157
    134         depends_lib             path:${ruby.bin}:ruby
     158        depends_lib             port:${implementation}
    135159
    136160        post-extract {
     
    276300                       
    277301                        destroot {
    278                           system "cd ${worksrcpath} && ${prefix}/bin/gem install --local --force --install-dir ${destroot}${prefix}/lib/ruby/gems/${ruby.version} ${distpath}/${distname}"
     302                          system "cd ${worksrcpath} && ${ruby.gem} install --local --force --install-dir ${destroot}${prefix}/lib/ruby/gems/${ruby.version} ${distpath}/${distname}"
    279303                       
    280304                                set binDir ${destroot}${prefix}/lib/ruby/gems/${ruby.version}/bin
  • branches/variant-descs-14482/base/src/programs/daemondo/main.c

    r31102 r40953  
    250250        ;
    251251       
    252     printf(helpText);
     252    printf("%s", helpText);
    253253}
    254254
  • branches/variant-descs-14482/base/src/registry1.0/receipt_flat.tcl

    r37509 r40953  
    764764}
    765765
     766# remove duplicate entries from the dep_map
     767# (could be put there by older versions of MacPorts)
     768proc clean_dep_map {args} {
     769    variable dep_map
     770    set new_map [list]
     771    set oldlen [llength $dep_map]
     772    ui_debug "Current dep_map has $oldlen entries"
     773    foreach de $dep_map {
     774        if {[lsearch -exact $new_map $de] == -1} {
     775            lappend new_map $de
     776        } else {
     777            ui_debug "Removing $de from dep_map"
     778        }
     779    }
     780    set dep_map $new_map
     781   
     782    set newlen [llength $dep_map]
     783    set diff [expr $oldlen - $newlen]
     784    ui_debug "New dep_map has $newlen entries"
     785    ui_info "Removed $diff duplicate entries from the dependency map"
     786}
     787
    766788proc write_dep_map {args} {
    767789        global macports::registry.path
  • branches/variant-descs-14482/base/src/registry1.0/registry.tcl

    r26177 r40953  
    371371}
    372372
     373proc clean_dep_map {args} {
     374    global macports::registry.format
     375    return [${macports::registry.format}::clean_dep_map $args]
     376}
     377
    373378proc write_dep_map {args} {
    374379        global macports::registry.format
  • branches/variant-descs-14482/base/src/registry2.0/Makefile

    r32208 r40953  
    88SHLIB_NAME= registry${SHLIB_SUFFIX}
    99INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/registry2.0
    10 export MACOSX_DEPLOYMENT_TARGET=10.3
    1110
    1211include ../../Mk/macports.autoconf.mk
  • branches/variant-descs-14482/base/src/registry2.0/entry.c

    r28029 r40953  
    6767}
    6868
     69/*
    6970static int obj_to_entry(Tcl_Interp* interp, reg_entry** entry, Tcl_Obj* obj,
    7071        reg_error* errPtr) {
     
    7879}
    7980
    80 /*
    8181static int list_obj_to_entry(Tcl_Interp* interp, reg_entry*** entries,
    8282        const Tcl_Obj** objv, int objc, reg_error* errPtr) {
  • branches/variant-descs-14482/base/src/registry2.0/registry.c

    r27967 r40953  
    108108    if (((reg_registry*)reg)->status & reg_attached) {
    109109        if (!registry_tcl_detach(interp, (reg_registry*)reg, &error)) {
    110             fprintf(stderr, error.description);
     110            fprintf(stderr, "%s", error.description);
    111111            reg_error_destruct(&error);
    112112        }
    113113    }
    114114    if (!reg_close((reg_registry*)reg, &error)) {
    115         fprintf(stderr, error.description);
     115        fprintf(stderr, "%s", error.description);
    116116        reg_error_destruct(&error);
    117117    }
  • branches/variant-descs-14482/base/src/tclobjc1.0/Makefile.in

    r33759 r40953  
    22SHLIB_NAME=     tclobjc${SHLIB_SUFFIX}
    33INSTALLDIR=     ${DESTDIR}${datadir}/macports/Tcl/tclobjc1.0
    4 export MACOSX_DEPLOYMENT_TARGET=10.3
    54
    65include ../../Mk/macports.autoconf.mk
  • branches/variant-descs-14482/base/src/tclobjc1.0/objc_encoding.m

    r26177 r40953  
    3737#define _GNU_SOURCE
    3838
     39#include <stdint.h>
    3940#include <stdio.h>
    4041#include <string.h>
     
    5657                        return (TCL_OK);
    5758                case _C_INT:
    58                         *objPtr = Tcl_NewIntObj((int) val);
     59                        *objPtr = Tcl_NewIntObj((int)(intptr_t)val);
    5960                        return (TCL_OK);
    6061                case _C_ID:
  • branches/variant-descs-14482/base/src/tclobjc1.0/tclobjc.h

    r26177 r40953  
    33 *
    44 * Authors:
    5  *      Keven Van Vechten <kvv@apple.com>
     5 *      Kevin Van Vechten <kvv@apple.com>
    66 *      Landon J. Fuller  <landonf@macports.org>
    77 *
  • branches/variant-descs-14482/base/src/tclobjc1.0/tclobjc.m

    r28668 r40953  
    115115                if (value > UINT_MAX || value < 0) {
    116116                    NSString *str = [NSString stringWithFormat:@"Unsigned integer argument invalid: %ld", value];
    117                     Tcl_Obj *tcl_result = Tcl_NewStringObj([str cString], -1);
     117                    Tcl_Obj *tcl_result = Tcl_NewStringObj([str UTF8String], -1);
    118118                    Tcl_SetObjResult(interp, tcl_result);
    119119                    result = TCL_ERROR;
     
    130130                } else {
    131131                        NSString* str = [NSString stringWithFormat:@"unexpected argument type %s at %s:%d", arg_type, __FILE__, __LINE__];
    132                         Tcl_Obj* tcl_result = Tcl_NewStringObj([str cString], -1);
     132                        Tcl_Obj* tcl_result = Tcl_NewStringObj([str UTF8String], -1);
    133133                        Tcl_SetObjResult(interp, tcl_result);
    134134                        result = TCL_ERROR;
     
    141141                Tcl_Obj *tcl_result;
    142142                [invocation invoke];
    143                 fprintf(stderr, "result size = %d\n", [signature methodReturnLength]);
     143                fprintf(stderr, "result size = %lu\n", (unsigned long)[signature methodReturnLength]);
    144144                void* result_ptr;
    145145                [invocation getReturnValue:&result_ptr];       
Note: See TracChangeset for help on using the changeset viewer.