Revision: 31689 http://trac.macosforge.org/projects/macports/changeset/31689 Author: jmpp@macports.org Date: 2007-12-03 01:14:57 -0800 (Mon, 03 Dec 2007) Log Message: ----------- Merged revisions 31618-31670,31672-31680 via svnmerge from http://svn.macports.org/repository/macports/trunk/base ........ r31618 | jmpp@macports.org | 2007-11-30 12:54:40 -0400 (Fri, 30 Nov 2007) | 4 lines Mark the db regen as done only once we're done processing all the ports in the index. ........ r31640 | jmpp@macports.org | 2007-11-30 23:32:13 -0400 (Fri, 30 Nov 2007) | 13 lines The ChangeLog was orignally meant to be a user-parsable file listing only major changes to base, so that we could use it in our release process to advertise our new goodies. Unfortunately, lately it has turned into a little bit of a file tracking commits to base, with a little bit of user level information and a lot of gaps in between to do either one right, bleh! Therefore add a real user-parsable NEWS file in which new features and bug fixes for each release will be advertised, starting with the contents of 1.6.0. Here's hoping that from now on the ChangeLog will turn into a file that truly tracks commits to base, with proper revision numbers for each entry and ticket numbers in case of bug fixes, after being spared from having to remain user-parsable. ........ r31641 | jmpp@macports.org | 2007-11-30 23:36:43 -0400 (Fri, 30 Nov 2007) | 1 line Correct some links on the ReadMe.rtf file. ........ r31642 | afb@macports.org | 2007-12-01 04:39:30 -0400 (Sat, 01 Dec 2007) | 1 line clean up work files, after calling packagemaker ........ r31669 | jmpp@macports.org | 2007-12-02 14:09:13 -0400 (Sun, 02 Dec 2007) | 6 lines Include hacking rules for commits to base with respect to the ChangeLog file NOTE: Needless to say, I'm more than open to suggestions to improve the fluency of this policy. ........ r31679 | jberry@macports.org | 2007-12-02 20:17:18 -0400 (Sun, 02 Dec 2007) | 1 line Revisions to language in HACKING file ........ r31680 | jberry@macports.org | 2007-12-02 20:24:31 -0400 (Sun, 02 Dec 2007) | 2 lines Hard wrap and detab HACKING file. Whitespace changes only. ........ Modified Paths: -------------- branches/release_1_6/base/ChangeLog branches/release_1_6/base/HACKING branches/release_1_6/base/portmgr/dmg/ReadMe.rtf branches/release_1_6/base/portmgr/jobs/PortIndex2MySQL.tcl branches/release_1_6/base/src/package1.0/portpkg.tcl Added Paths: ----------- branches/release_1_6/base/NEWS Property Changed: ---------------- branches/release_1_6/base/ Property changes on: branches/release_1_6/base ___________________________________________________________________ Name: svnmerge-integrated - /trunk/base:1-31413,31415-31490,31493-31494,31497-31499,31501-31519,31521-31599,31681 + /trunk/base:1-31413,31415-31490,31493-31494,31497-31499,31501-31519,31521-31599,31618-31670,31672-31681 Modified: branches/release_1_6/base/ChangeLog =================================================================== --- branches/release_1_6/base/ChangeLog 2007-12-03 09:02:44 UTC (rev 31688) +++ branches/release_1_6/base/ChangeLog 2007-12-03 09:14:57 UTC (rev 31689) @@ -56,7 +56,7 @@ - prevent creating PKG packages with /etc or /var or /tmp (#2102, afb in r29445) - - add optional configure.ccache and configure.distcc filters (#5390, afb in 29438) + - add optional configure.ccache and configure.distcc filters (#5390, afb in r29438) - Explicitly sort fs-traverse so it behaves predictably on Linux systems (#12622, eridius in r29412). Modified: branches/release_1_6/base/HACKING =================================================================== --- branches/release_1_6/base/HACKING 2007-12-03 09:02:44 UTC (rev 31688) +++ branches/release_1_6/base/HACKING 2007-12-03 09:14:57 UTC (rev 31689) @@ -1,24 +1,72 @@ -Project naming and copyright attribution: +# Project naming and copyright attribution: -* "The MacPorts Project" is the string that shall be used whereever there's a need to reference our project name, such as in copyright notices. -* A developer or contributor is advised to attribute himself a copyright notice if he/she is contributing a full new source file or a full new feature - to an already existing source file in the "base" component of our repository. -* An exception to this rule is our Portfiles, since they are partly meant for human eyes consumption and the boilerplate header comments should be kept - down to a minimum -* A copyright notice attributed to our group name, "The MacPorts Project", should also be added to these source files (if not already there) if they're - being uploaded to the "base" component of our repository, since as such they are being contributed to the project. + * "The MacPorts Project" is the string that shall be used whereever + there's a need to reference our project name, such as in copyright + notices. + * A developer or contributor is advised to attribute himself a copyright + notice if he/she is contributing a full new source file or a full + new feature to an already existing source file in the "base" + component of our repository. -Whitespace rules as discussed on the development list (macports-dev): + * An exception to this rule is our Portfiles, since they are partly + meant for human eyes consumption and the boilerplate header comments + should be kept down to a minimum -* All source code files MUST use soft tabs at a tabstop of 4. No hard tabs are allowed. -* All source code files SHOULD have the following as the first line of the file: - # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4 - This is a modeline that works for both emacs and vim. -* Portfiles SHOULD use soft tabs at a tabstop of 4, but implementation of this is left up to the discretion of the maintainer. -* Portfiles SHOULD use the given modeline -* Makefiles MUST use tabs as it is required by the syntax. Makefiles SHOULD use a tab stop of 8. -* Makefiles MAY use a modeline. The following works for emacs and vim: - # -*- coding: utf-8; mode: Makefile; tab-width: 8; indent-tabs-mode: t -*- vim:fenc=utf-8:filetype=Makefile:noet:sw=8:ts=8 -* All other files (documentation, etc) SHOULD use soft tabs at a tabstop of 4 if the document format allows. -* All other files (documentation, etc) SHOULD NOT use a modeline as it is probably meant for human consumption. + * A copyright notice attributed to our group name, "The MacPorts + Project", should also be added to these source files (if not already + there) if they're being uploaded to the "base" component of our + repository, since as such they are being contributed to the project. + + +# Commits to the "base" component of the repository: + + * Commits with user-visible affect made to the "base" component of the + repository should be accompanied by a corresponding entry in the + base/ChanegeLog file, with references to pertitent Trac ticket + numbers and svn commit revisions where appropriate. + + * Such entries to the ChangeLog need not be full duplications of their + related commit logs if the latter are thorough explanations of + what's involved in the commit. In such cases it's perfectly + acceptable to enter just a summary of the commit and point the + reader to further information through the related svn revision and + Trac ticket number (if applicable). + + * Related commits to "base" should be grouped in a single ChangeLog + entry. + + * Commits to "base" need not update the base/NEWS file, as such will be + constructed with the relevant information at MacPorts release time + by the release engineers. + + +# Whitespace rules as discussed on the development list (macports-dev): + + * All source code files MUST use soft tabs at a tabstop of 4. No hard + tabs are allowed. + + * All source code files SHOULD have the following as the first line of + the file: + + # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4 + + This is a modeline that works for both emacs and vim. + + * Portfiles SHOULD use soft tabs at a tabstop of 4, but implementation + of this is left up to the discretion of the maintainer. + + * Portfiles SHOULD use the given modeline + + * Makefiles MUST use tabs as it is required by the syntax. Makefiles + SHOULD use a tab stop of 8. + + * Makefiles MAY use a modeline. The following works for emacs and vim: + + # -*- coding: utf-8; mode: Makefile; tab-width: 8; indent-tabs-mode: t -*- vim:fenc=utf-8:filetype=Makefile:noet:sw=8:ts=8 + + * All other files (documentation, etc) SHOULD use soft tabs at a tabstop + of 4 if the document format allows. + + * All other files (documentation, etc) SHOULD NOT use a modeline as it + is probably meant for human consumption. Copied: branches/release_1_6/base/NEWS (from rev 31669, trunk/base/NEWS) =================================================================== --- branches/release_1_6/base/NEWS (rev 0) +++ branches/release_1_6/base/NEWS 2007-12-03 09:14:57 UTC (rev 31689) @@ -0,0 +1,90 @@ + +What's new: + +*) Revived and thoroughly refreshed web presence at http://www.macports.org/ , with more improvements still on the way; +*) New project guide temporarily at http://trac.macports.org/projects/macports/ ; + + +Overview of Changes from MacPorts 1.5.2 to MacPorts 1.6.0: + +# For regular usage: + +*) Fixed the "upgrade" target of the port(1) command to properly handle installed versions beginning with letters; +*) Improved the "variants" target of the port(1) command to behave like the "info" target to poll the requested Portfile directly + rather than the index for more up-to-date information, while also providing a --index flag for legacy behavior; +*) Fixed a bug by which a user specific 'macports.conf' file would not be read; +*) Tightened security by installing MacPorts in 0755 mode (no write permission for group and others) by default; +*) Added 'none' as a possible option for supported types of startupitems scripts; +*) Disabled readline support in interactive mode of the port(1) command by deafult; +*) Fixed a bug by which the "variants" target of the port(1) command would spit out an error backtrace to the terminal when no match + was found for the requested port; + +# Individual port-building related improvements: + +*) Eugene Pimenov's GSoC2007 work on improving "trace mode" for the building of ports in clean environments, + http://trac.macports.org/projects/macports/wiki/soc2007/epimenov ; +*) Added 'bsdmake' and 'gnumake' defaults for building ports on the FreeBSD and Linux platforms; +*) Added 'configureccache' and 'configuredistcc' configuration options to the main 'macports.conf' for distributed + builds (defaulting to no); +*) Improved building of configure-based universal ports on Leopard; +*) Fixed a bug by which the 'universal' variant would disappear if a 'macosx' variant was selected; +*) Added a 'macosx_deployment_target' option to the main 'macports.conf' file for ports that benefit form this Mac OS X specific flag; +*) Added a 'configurepipe' option to the main 'macports.conf' file for using pipes rather than intermediate files when compiling C/C++ + based ports; + + +# Packaging related improvements: + +*) Created pkg's no longer have /etc, /var/ or /tmp directories in them; +*) Fixed a bug by which all .mpkg packages were missing their welcome page; +*) Fixed a bug by which HTML contents were written as a pkg's Welcome.rtf file, causing it to not display at all; +*) Made the homepage clickable in a pkg's welcoming screen; +*) Added support lzma compression for archives; +*) Improved pkg & dmg creation on Leopard, for both Intel and PowerPC platforms; +*) Added an 'mdmg' target, for the creation of a dmg for a port and its dependencies; +*) Dramatically improved performace of the port(1) command's Portfile level actions like "file", "dir", "work" and "url" + + +# For Portfile writers: + +*) Added more compiler suites as options to the 'configure.compiler' Portfile option; +*) Added 'configure.fflags' 'configure.fcflags' 'configure.f90flags' Portfile options for Fortran based ports; +*) Added 'configure.javac' and 'configure.classpath' Portfile options for Java ports; +*) Added 'configure.objc' 'configure.objcflags' Portfile options for Objective-C based ports; +*) Added 'build.nice' and 'build.jobs' Portfile options for parallel builds and build prioritizing; +*) Added 'startupitem.netchange' boolean flag Portfile option for generated startup scripts; +*) Added a "lint" target to the port(1) command, for Portfile verification and beautification; +*) Added Portfile group code for Python 3.0 based ports and deprecated the plain 'python' group code; +*) Added generic GNU livecheck rules; +*) The "x86" platform has been normalized as "i386"; +*) Added a 'use_parallel_build' Portfile option for declaring if a particular port can be built in paralel through make's -j flag, + defaulting to no; +*) Added 'configure.awk', 'configure.bison', 'configure.pkg_config', 'configure.pkg_config_path' Portfile options to point to the + relevant programs/paths to use; +*) Added a 'extract.mkdir' Portfile option to better deal with so-called "tar bombs"; +*) Added a 'configure.pipe' Portfile option for using pipes rather than intermediate files when compiling C/C++ based ports; + + +# For MacPorts scripting: + +*) Moved the 'ui_isset' and 'global_option_isset' Tcl procedures for testing of the UI and global options to the macports1.0 API + sparing its clients from having to implement them; +*) Improved defaults for implicit ui_prefix and ui_channels behaviour at the macports1.0 layer; + + +# Miscellaenous: + +*) Added MacPorts-configure time checks for Mac OS X and Xcode versions and warnings for old versions; +*) Added a 'user-agent' parameters to our libcurl based fetching of sources for sites that require a user agent; +*) 'livecheck' regular expressions are now checked against each entry in the listed master_site in the Portfile; +*) Fixed regexp in livecheck code to work when there is both a tag and a subdir in the mirror uri; +*) Improved the integrated "daemondo" program to better handle the death of startupitem-based programs; +*) Added a "--restart-wait=n" argument to the integrated "daemondo" program to control the number of seconds to wait during restart of + the process it is monitoring, defaulting to 3; +*) Enabled building of our objc bridge against GNUStep on platforms other than Mac OS X; +*) Added support for packing of MacPorts itself on FreeBSD and Fedora platforms; +*) Added SourceForge.jp to our list of SourceForge based mirrors for sources fetching; +*) Added http mirror sites for the postgresql mirrors list; +*) Added the ftp://ftp.gnu.org/old-gnu/ mirror to the GNU mirrors list; +*) Fixed a bug by which paths with embedded spaces would cause the "dp2mp-move" upgrade code to fail when trying to find user specific + 'macports.conf' files; Modified: branches/release_1_6/base/portmgr/dmg/ReadMe.rtf =================================================================== --- branches/release_1_6/base/portmgr/dmg/ReadMe.rtf 2007-12-03 09:02:44 UTC (rev 31688) +++ branches/release_1_6/base/portmgr/dmg/ReadMe.rtf 2007-12-03 09:14:57 UTC (rev 31689) @@ -26,7 +26,7 @@ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural \f0\b0 \cf0 \ -The MacPorts installer copies MacPorts to the target directory /opt/local. If you wish to install to any path other than that, you must install MacPorts via its source code. See {\field{\*\fldinst{HYPERLINK "http://trac.macosforge.org/projects/macports/wiki/InstallingMacPorts"}}{\fldrslt Installing MacPorts}} on the MacPorts Wiki for instructions on installation alternatives.\ +The MacPorts installer copies MacPorts to the target directory /opt/local. If you wish to install to any path other than that, you must install MacPorts via its source code. See {\field{\*\fldinst{HYPERLINK "http://www.macports.org/install.php"}}{\fldrslt Installing MacPorts}} on the MacPorts webpage for instructions on installation alternatives.\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural \f1\b \cf0 \ @@ -99,7 +99,7 @@ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural \f0\b0 \cf0 \ -The MacPorts Wiki is available at: {\field{\*\fldinst{HYPERLINK "http://trac.macosforge.org/projects/macports/wiki/"}}{\fldrslt http://trac.macports.org}} and should be consulted for further documentation and support. Also provided are man pages for +The MacPorts Wiki is available at: {\field{\*\fldinst{HYPERLINK "http://trac.macports.org/projects/macports/wiki/"}}{\fldrslt http://trac.macports.org}} and should be consulted for further documentation and support. Also provided are man pages for \f2\i port \f0\i0 , \f2\i macports.conf Modified: branches/release_1_6/base/portmgr/jobs/PortIndex2MySQL.tcl =================================================================== --- branches/release_1_6/base/portmgr/jobs/PortIndex2MySQL.tcl 2007-12-03 09:02:44 UTC (rev 31688) +++ branches/release_1_6/base/portmgr/jobs/PortIndex2MySQL.tcl 2007-12-03 09:14:57 UTC (rev 31689) @@ -229,7 +229,6 @@ # Do we need any other? puts $sqlfile_fd "DROP TABLE IF EXISTS log;" puts $sqlfile_fd "CREATE TABLE log (activity VARCHAR(255), activity_time TIMESTAMP(14));" -puts $sqlfile_fd "INSERT INTO log VALUES ('update', NOW());" puts $sqlfile_fd "DROP TABLE IF EXISTS portfiles;" puts $sqlfile_fd "CREATE TABLE portfiles (name VARCHAR(255) PRIMARY KEY NOT NULL, path VARCHAR(255), version VARCHAR(255), description TEXT);" @@ -348,7 +347,10 @@ } +# Mark the db regen as done only once we're done processing all ports: +puts $sqlfile_fd "INSERT INTO log VALUES ('update', NOW());" + # Pipe the contents of the generated sql file to the database command, # reading from the file descriptor for the raw sql file to assure completeness. if {[catch {seek $sqlfile_fd 0 start} errstr]} { Modified: branches/release_1_6/base/src/package1.0/portpkg.tcl =================================================================== --- branches/release_1_6/base/src/package1.0/portpkg.tcl 2007-12-03 09:02:44 UTC (rev 31688) +++ branches/release_1_6/base/src/package1.0/portpkg.tcl 2007-12-03 09:14:57 UTC (rev 31689) @@ -120,6 +120,11 @@ system "$packagemaker -build -f ${destpath} -p ${pkgpath} -r ${resourcepath} -i ${workpath}/Info.plist -d ${workpath}/Description.plist" } + file delete ${workpath}/Info.plist + file delete ${workpath}/PackageInfo + file delete ${workpath}/Description.plist + file delete -force ${workpath}/pkg_resources + } else { write_PkgInfo ${pkgpath}/Contents/PkgInfo