[84757] branches/gsoc11-rev-upgrade/base
cal at macports.org
cal at macports.org
Fri Sep 30 10:24:30 PDT 2011
Revision: 84757
http://trac.macports.org/changeset/84757
Author: cal at macports.org
Date: 2011-09-30 10:24:30 -0700 (Fri, 30 Sep 2011)
Log Message:
-----------
Merge from trunk
Modified Paths:
--------------
branches/gsoc11-rev-upgrade/base/ChangeLog
branches/gsoc11-rev-upgrade/base/config/RELEASE_URL
branches/gsoc11-rev-upgrade/base/portmgr/ReleaseProcess
branches/gsoc11-rev-upgrade/base/portmgr/dmg/postflight
branches/gsoc11-rev-upgrade/base/portmgr/jobs/mirror_macports.sh
branches/gsoc11-rev-upgrade/base/portmgr/jobs/port_binary_distributable.tcl
branches/gsoc11-rev-upgrade/base/src/cregistry/entry.c
branches/gsoc11-rev-upgrade/base/src/cregistry/registry.c
branches/gsoc11-rev-upgrade/base/src/pextlib1.0/curl.c
branches/gsoc11-rev-upgrade/base/src/port1.0/portdistfiles.tcl
branches/gsoc11-rev-upgrade/base/src/port1.0/portfetch.tcl
branches/gsoc11-rev-upgrade/base/src/port1.0/portlint.tcl
branches/gsoc11-rev-upgrade/base/src/port1.0/portutil.tcl
branches/gsoc11-rev-upgrade/base/src/registry2.0/portimage.tcl
branches/gsoc11-rev-upgrade/base/tests/Makefile
Added Paths:
-----------
branches/gsoc11-rev-upgrade/base/tests/test/svn-and-patchsites/
branches/gsoc11-rev-upgrade/base/tests/test/svn-and-patchsites/Portfile
branches/gsoc11-rev-upgrade/base/tests/test/svn-and-patchsites/master
Removed Paths:
-------------
branches/gsoc11-rev-upgrade/base/tests/test/cvs-and-patchsites/
Property Changed:
----------------
branches/gsoc11-rev-upgrade/base/
branches/gsoc11-rev-upgrade/base/portmgr/fedora/macports.spec
branches/gsoc11-rev-upgrade/base/src/pextlib1.0/sha2.c
branches/gsoc11-rev-upgrade/base/src/pextlib1.0/sha2.h
branches/gsoc11-rev-upgrade/base/src/pextlib1.0/sha256cmd.c
branches/gsoc11-rev-upgrade/base/src/pextlib1.0/sha256cmd.h
branches/gsoc11-rev-upgrade/base/src/registry2.0/receipt_sqlite.tcl
Property changes on: branches/gsoc11-rev-upgrade/base
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:78828-83524
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
+ /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:78828-84751
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
Modified: branches/gsoc11-rev-upgrade/base/ChangeLog
===================================================================
--- branches/gsoc11-rev-upgrade/base/ChangeLog 2011-09-30 17:23:30 UTC (rev 84756)
+++ branches/gsoc11-rev-upgrade/base/ChangeLog 2011-09-30 17:24:30 UTC (rev 84757)
@@ -10,6 +10,10 @@
found in option-strsed.
(raimue in r82760, r82761)
+Release 2.0.3 (2011-09-05 by raimue)
+ - Fix a regression introduced in 2.0.2 when fetching with a VCS
+ (#31073, jmr in r83471)
+
Release 2.0.2 (2011-09-01 by jmr):
- Messages recommending running selfupdate will no longer be printed when
selfupdate is being run. (#23094, jmr in r83270, r83391)
Modified: branches/gsoc11-rev-upgrade/base/config/RELEASE_URL
===================================================================
--- branches/gsoc11-rev-upgrade/base/config/RELEASE_URL 2011-09-30 17:23:30 UTC (rev 84756)
+++ branches/gsoc11-rev-upgrade/base/config/RELEASE_URL 2011-09-30 17:24:30 UTC (rev 84757)
@@ -1 +1 @@
-https://svn.macports.org/repository/macports/tags/release_2_0_2/base
+https://svn.macports.org/repository/macports/tags/release_2_0_3/base
Modified: branches/gsoc11-rev-upgrade/base/portmgr/ReleaseProcess
===================================================================
--- branches/gsoc11-rev-upgrade/base/portmgr/ReleaseProcess 2011-09-30 17:23:30 UTC (rev 84756)
+++ branches/gsoc11-rev-upgrade/base/portmgr/ReleaseProcess 2011-09-30 17:24:30 UTC (rev 84757)
@@ -129,7 +129,7 @@
All these tarballs are uploaded to the http://distfiles.macports.org/MacPorts/ directory. At present, this must
be done with the help of the MacOSForge sysadmin.
-Additionally, a file is created, and posted to the same location, that contains md5, sha1, and rmd160 checksums
+Additionally, a file is created, and posted to the same location, that contains md5, sha1, rmd160, and sha256 checksums
for each of the files:
MacPorts-2.0.0.chk.txt
Modified: branches/gsoc11-rev-upgrade/base/portmgr/dmg/postflight
===================================================================
--- branches/gsoc11-rev-upgrade/base/portmgr/dmg/postflight 2011-09-30 17:23:30 UTC (rev 84756)
+++ branches/gsoc11-rev-upgrade/base/portmgr/dmg/postflight 2011-09-30 17:24:30 UTC (rev 84757)
@@ -87,19 +87,19 @@
# backing up the original only if it exists and if it doesn't contain the ${OUR_STRING} identification string,
# which hints that we've already tweaked it and therefore already backed it up.
function write_setting () {
- if [[ -f ${HOME}/.${CONF_FILE} ]] && ! grep "${OUR_STRING}" ${HOME}/.${CONF_FILE} > /dev/null; then
+ if [[ -f "${HOME}/.${CONF_FILE}" ]] && ! grep "${OUR_STRING}" "${HOME}/.${CONF_FILE}" > /dev/null; then
echo "Backing up your ${HOME}/.${CONF_FILE} shell confguration file as ${HOME}/.${CONF_FILE}.${BACKUP_SUFFIX} before adapting it for MacPorts."
- /bin/cp -fp ${HOME}/.${CONF_FILE} "${HOME}/.${CONF_FILE}.${BACKUP_SUFFIX}" || {
+ /bin/cp -fp "${HOME}/.${CONF_FILE}" "${HOME}/.${CONF_FILE}.${BACKUP_SUFFIX}" || {
echo "An attempt to backup your original configuration file failed! Please set your MacPorts compatible environment manually."
update_macports
exit 1
}
- echo -e "\n##\n# Your previous ${HOME}/.${CONF_FILE} file was backed up as ${HOME}/.${CONF_FILE}.${BACKUP_SUFFIX}\n##" >> ${HOME}/.${CONF_FILE}
+ echo -e "\n##\n# Your previous ${HOME}/.${CONF_FILE} file was backed up as ${HOME}/.${CONF_FILE}.${BACKUP_SUFFIX}\n##" >> "${HOME}/.${CONF_FILE}"
fi
- echo -e "\n# ${OUR_STRING}: adding an appropriate ${1} variable for use with MacPorts." >> ${HOME}/.${CONF_FILE}
- echo "${ENV_COMMAND} ${1}${ASSIGN}${2}" >> ${HOME}/.${CONF_FILE}
- echo -e "# Finished adapting your ${1} environment variable for use with MacPorts.\n" >> ${HOME}/.${CONF_FILE}
- chown ${USER} ${HOME}/.${CONF_FILE} || echo "Warning: unable to adapt permissions on your ${HOME}/.${CONF_FILE} shell configuration file!"
+ echo -e "\n# ${OUR_STRING}: adding an appropriate ${1} variable for use with MacPorts." >> "${HOME}/.${CONF_FILE}"
+ echo "${ENV_COMMAND} ${1}${ASSIGN}${2}" >> "${HOME}/.${CONF_FILE}"
+ echo -e "# Finished adapting your ${1} environment variable for use with MacPorts.\n" >> "${HOME}/.${CONF_FILE}"
+ chown ${USER} "${HOME}/.${CONF_FILE}" || echo "Warning: unable to adapt permissions on your ${HOME}/.${CONF_FILE} shell configuration file!"
echo "An appropriate ${1} variable has been added to your shell environment by the MacPorts installer."
}
@@ -204,9 +204,9 @@
LOGIN_FLAG=""
ENV_COMMAND="setenv"
ASSIGN=" "
- if [[ -f ${HOME}/.tcshrc ]]; then
+ if [[ -f "${HOME}/.tcshrc" ]]; then
CONF_FILE=tcshrc
- elif [[ -f ${HOME}/.cshrc ]]; then
+ elif [[ -f "${HOME}/.cshrc" ]]; then
CONF_FILE=cshrc
else
CONF_FILE=tcshrc
@@ -217,9 +217,9 @@
LOGIN_FLAG="-l"
ENV_COMMAND="export"
ASSIGN="="
- if [[ -f ${HOME}/.bash_profile ]]; then
+ if [[ -f "${HOME}/.bash_profile" ]]; then
CONF_FILE=bash_profile
- elif [[ -f ${HOME}/.bash_login ]]; then
+ elif [[ -f "${HOME}/.bash_login" ]]; then
CONF_FILE=bash_login
else
CONF_FILE=profile
@@ -269,6 +269,7 @@
# Postflight script is done with its job, update MacPorts and exit gracefully!
update_macports
-echo "You have succesfully installed the MacPorts system, launch a terminal and try it out!"
-echo "Read the port(1) manual page and http://guide.macports.org for help, http://www.macports.org/contact.php if you need to get in touch with The MacPorts Project."
+echo "You have successfully installed the MacPorts system. Launch a terminal and try it out!"
+echo "Read the port(1) manual page and http://guide.macports.org/ for help."
+echo "See http://www.macports.org/contact.php if you need to get in touch with The MacPorts Project."
exit 0
Property changes on: branches/gsoc11-rev-upgrade/base/portmgr/fedora/macports.spec
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base/portmgr/fedora/macports.spec:37343-46937
/branches/universal-sanity/base/portmgr/fedora/macports.spec:51872-52323
/branches/variant-descs-14482/base/portmgr/fedora/macports.spec:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/portmgr/fedora/macports.spec:78828-83524
/trunk/base/portmgr/fedora/macports.spec.in:30388-57826
/users/perry/base-bugs_and_notes/portmgr/fedora/macports.spec:45682-46060
/users/perry/base-select/portmgr/fedora/macports.spec:44044-44692
+ /branches/gsoc08-privileges/base/portmgr/fedora/macports.spec:37343-46937
/branches/universal-sanity/base/portmgr/fedora/macports.spec:51872-52323
/branches/variant-descs-14482/base/portmgr/fedora/macports.spec:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/portmgr/fedora/macports.spec:78828-84751
/trunk/base/portmgr/fedora/macports.spec.in:30388-57826
/users/perry/base-bugs_and_notes/portmgr/fedora/macports.spec:45682-46060
/users/perry/base-select/portmgr/fedora/macports.spec:44044-44692
Modified: branches/gsoc11-rev-upgrade/base/portmgr/jobs/mirror_macports.sh
===================================================================
--- branches/gsoc11-rev-upgrade/base/portmgr/jobs/mirror_macports.sh 2011-09-30 17:23:30 UTC (rev 84756)
+++ branches/gsoc11-rev-upgrade/base/portmgr/jobs/mirror_macports.sh 2011-09-30 17:24:30 UTC (rev 84757)
@@ -7,7 +7,7 @@
####
# regexp of ports that we do not mirror
-EXCLUSIONS='^(molden)$'
+EXCLUSIONS='^(molden|metis)$'
# macports really wants this, so lets appease it
export COLUMNS=80
Modified: branches/gsoc11-rev-upgrade/base/portmgr/jobs/port_binary_distributable.tcl
===================================================================
--- branches/gsoc11-rev-upgrade/base/portmgr/jobs/port_binary_distributable.tcl 2011-09-30 17:23:30 UTC (rev 84756)
+++ branches/gsoc11-rev-upgrade/base/portmgr/jobs/port_binary_distributable.tcl 2011-09-30 17:24:30 UTC (rev 84757)
@@ -34,11 +34,12 @@
# variants like CeCILL and the AGPL) and is not in the list of licenses known
# to do so below.
# 'Noncommercial' means a license that prohibits commercial use.
-set good_licenses {afl agpl apache apsl artistic autoconf boost bsd cecill copyleft cpl
- curl fontconfig freebsd freetype gfdl gd gpl gplconflict ibmpl ijg
- jasper lgpl lppl libpng libtool mit mpl ncsa noncommercial openssl permissive
- php psf qpl public-domain restrictive/distributable ruby sleepycat
- ssleay tcl/tk x11 wtfpl zlib zpl}
+set good_licenses {afl agpl apache apsl artistic autoconf boost bsd cecill \
+ copyleft cpl curl epl fontconfig freebsd freetype gd gfdl \
+ gpl gplconflict ibmpl ijg isc jasper lgpl libpng libtool \
+ lppl mit mpl ncsa noncommercial openssl permissive php \
+ psf public-domain qpl restrictive/distributable ruby \
+ sleepycat ssleay tcl/tk w3c wtfpl x11 zlib zpl}
foreach lic $good_licenses {
set license_good($lic) 1
}
@@ -61,10 +62,11 @@
apache-1.1 {agpl gpl}
apsl {cecill gpl}
cpl {cecill gpl}
- cecill {afl agpl apache apsl cpl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1}
+ cecill {afl agpl apache apsl cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1}
+ epl {cecill gpl}
freetype {gpl-2}
gd {cecill gpl}
- gpl {afl agpl apache-1 apache-1.1 apsl cpl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1}
+ gpl {afl agpl apache-1 apache-1.1 apsl cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1}
gpl-1 {apache gpl-3 gpl-3+ lgpl-3 lgpl-3+}
gpl-2 {apache freetype gpl-3 gpl-3+ lgpl-3 lgpl-3+}
gpl-3 {gpl-1 gpl-2}
Modified: branches/gsoc11-rev-upgrade/base/src/cregistry/entry.c
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/cregistry/entry.c 2011-09-30 17:23:30 UTC (rev 84756)
+++ branches/gsoc11-rev-upgrade/base/src/cregistry/entry.c 2011-09-30 17:24:30 UTC (rev 84757)
@@ -181,9 +181,15 @@
char* revision, char* variants, char* epoch, reg_error* errPtr) {
sqlite3_stmt* stmt = NULL;
reg_entry* entry = NULL;
- char* query = "SELECT id FROM registry.ports WHERE name=? AND version=? "
+ int lower_bound = 0;
+ char* query;
+ if (strlen(epoch) > 0) {
+ query = "SELECT id FROM registry.ports WHERE name=? AND version=? "
"AND revision=? AND variants=? AND epoch=?";
- int lower_bound = 0;
+ } else {
+ query = "SELECT id FROM registry.ports WHERE name=? AND version=? "
+ "AND revision=? AND variants=? AND epoch!=?";
+ }
if ((sqlite3_prepare(reg->db, query, -1, &stmt, NULL) == SQLITE_OK)
&& (sqlite3_bind_text(stmt, 1, name, -1, SQLITE_STATIC)
== SQLITE_OK)
Modified: branches/gsoc11-rev-upgrade/base/src/cregistry/registry.c
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/cregistry/registry.c 2011-09-30 17:23:30 UTC (rev 84756)
+++ branches/gsoc11-rev-upgrade/base/src/cregistry/registry.c 2011-09-30 17:24:30 UTC (rev 84757)
@@ -195,10 +195,8 @@
if (!(sb.st_mode & S_IWGRP)) {
can_write = 0;
}
- } else {
- if (!(sb.st_mode & S_IWOTH)) {
- can_write = 0;
- }
+ } else if (!(sb.st_mode & S_IWOTH) && getuid() != 0) {
+ can_write = 0;
}
}
if (initialized || can_write) {
Modified: branches/gsoc11-rev-upgrade/base/src/pextlib1.0/curl.c
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/pextlib1.0/curl.c 2011-09-30 17:23:30 UTC (rev 84756)
+++ branches/gsoc11-rev-upgrade/base/src/pextlib1.0/curl.c 2011-09-30 17:24:30 UTC (rev 84757)
@@ -237,6 +237,20 @@
break;
}
+#if LIBCURL_VERSION_NUM == 0x071307
+ /* FTP_PROXY workaround for Snow Leopard */
+ if (strncmp(theURL, "ftp:", 4) == 0) {
+ char *ftp_proxy = getenv("FTP_PROXY");
+ if (ftp_proxy) {
+ theCurlCode = curl_easy_setopt(theHandle, CURLOPT_PROXY, ftp_proxy);
+ if (theCurlCode != CURLE_OK) {
+ theResult = SetResultFromCurlErrorCode(interp, theCurlCode);
+ break;
+ }
+ }
+ }
+#endif
+
/* -L option */
theCurlCode = curl_easy_setopt(theHandle, CURLOPT_FOLLOWLOCATION, 1);
if (theCurlCode != CURLE_OK) {
Property changes on: branches/gsoc11-rev-upgrade/base/src/pextlib1.0/sha2.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base/src/pextlib1.0/sha2.c:37343-46937
/branches/universal-sanity/base/src/pextlib1.0/sha2.c:51872-52323
/branches/variant-descs-14482/base/src/pextlib1.0/sha2.c:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/pextlib1.0/sha2.c:78828-83524
/users/perry/base-bugs_and_notes/src/pextlib1.0/sha2.c:45682-46060
/users/perry/base-select/src/pextlib1.0/sha2.c:44044-44692
+ /branches/gsoc08-privileges/base/src/pextlib1.0/sha2.c:37343-46937
/branches/universal-sanity/base/src/pextlib1.0/sha2.c:51872-52323
/branches/variant-descs-14482/base/src/pextlib1.0/sha2.c:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/pextlib1.0/sha2.c:78828-84751
/users/perry/base-bugs_and_notes/src/pextlib1.0/sha2.c:45682-46060
/users/perry/base-select/src/pextlib1.0/sha2.c:44044-44692
Property changes on: branches/gsoc11-rev-upgrade/base/src/pextlib1.0/sha2.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base/src/pextlib1.0/sha2.h:37343-46937
/branches/universal-sanity/base/src/pextlib1.0/sha2.h:51872-52323
/branches/variant-descs-14482/base/src/pextlib1.0/sha2.h:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/pextlib1.0/sha2.h:78828-83524
/users/perry/base-bugs_and_notes/src/pextlib1.0/sha2.h:45682-46060
/users/perry/base-select/src/pextlib1.0/sha2.h:44044-44692
+ /branches/gsoc08-privileges/base/src/pextlib1.0/sha2.h:37343-46937
/branches/universal-sanity/base/src/pextlib1.0/sha2.h:51872-52323
/branches/variant-descs-14482/base/src/pextlib1.0/sha2.h:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/pextlib1.0/sha2.h:78828-84751
/users/perry/base-bugs_and_notes/src/pextlib1.0/sha2.h:45682-46060
/users/perry/base-select/src/pextlib1.0/sha2.h:44044-44692
Property changes on: branches/gsoc11-rev-upgrade/base/src/pextlib1.0/sha256cmd.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base/src/pextlib1.0/rmd160cmd.c:37343-46937
/branches/gsoc09-logging/base/src/pextlib1.0/sha256cmd.c:51231-60371
/branches/universal-sanity/base/src/pextlib1.0/rmd160cmd.c:51872-52323
/branches/variant-descs-14482/base/src/pextlib1.0/rmd160cmd.c:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/pextlib1.0/sha256cmd.c:78828-83524
/users/perry/base-bugs_and_notes/src/pextlib1.0/rmd160cmd.c:45682-46060
/users/perry/base-select/src/pextlib1.0/rmd160cmd.c:44044-44692
+ /branches/gsoc08-privileges/base/src/pextlib1.0/rmd160cmd.c:37343-46937
/branches/gsoc09-logging/base/src/pextlib1.0/sha256cmd.c:51231-60371
/branches/universal-sanity/base/src/pextlib1.0/rmd160cmd.c:51872-52323
/branches/variant-descs-14482/base/src/pextlib1.0/rmd160cmd.c:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/pextlib1.0/sha256cmd.c:78828-84751
/users/perry/base-bugs_and_notes/src/pextlib1.0/rmd160cmd.c:45682-46060
/users/perry/base-select/src/pextlib1.0/rmd160cmd.c:44044-44692
Property changes on: branches/gsoc11-rev-upgrade/base/src/pextlib1.0/sha256cmd.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base/src/pextlib1.0/rmd160cmd.h:37343-46937
/branches/gsoc09-logging/base/src/pextlib1.0/sha256cmd.h:51231-60371
/branches/universal-sanity/base/src/pextlib1.0/rmd160cmd.h:51872-52323
/branches/variant-descs-14482/base/src/pextlib1.0/rmd160cmd.h:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/pextlib1.0/sha256cmd.h:78828-83524
/users/perry/base-bugs_and_notes/src/pextlib1.0/rmd160cmd.h:45682-46060
/users/perry/base-select/src/pextlib1.0/rmd160cmd.h:44044-44692
+ /branches/gsoc08-privileges/base/src/pextlib1.0/rmd160cmd.h:37343-46937
/branches/gsoc09-logging/base/src/pextlib1.0/sha256cmd.h:51231-60371
/branches/universal-sanity/base/src/pextlib1.0/rmd160cmd.h:51872-52323
/branches/variant-descs-14482/base/src/pextlib1.0/rmd160cmd.h:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/pextlib1.0/sha256cmd.h:78828-84751
/users/perry/base-bugs_and_notes/src/pextlib1.0/rmd160cmd.h:45682-46060
/users/perry/base-select/src/pextlib1.0/rmd160cmd.h:44044-44692
Modified: branches/gsoc11-rev-upgrade/base/src/port1.0/portdistfiles.tcl
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/port1.0/portdistfiles.tcl 2011-09-30 17:23:30 UTC (rev 84756)
+++ branches/gsoc11-rev-upgrade/base/src/port1.0/portdistfiles.tcl 2011-09-30 17:24:30 UTC (rev 84757)
@@ -53,10 +53,12 @@
}
proc portdistfiles::distfiles_main {args} {
- global UI_PREFIX master_sites checksums_array portdbpath dist_subdir all_dist_files
+ global UI_PREFIX master_sites patch_sites patchfiles checksums_array \
+ portdbpath dist_subdir all_dist_files
# give up on ports that do not provide URLs
- if {![info exists master_sites] || $master_sites == "{}"} {
+ if {(![info exists master_sites] || $master_sites == "{}")
+ && (![info exists patchfiles] || ![info exists patch_sites] || $patch_sites == "{}")} {
return 0
}
Modified: branches/gsoc11-rev-upgrade/base/src/port1.0/portfetch.tcl
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/port1.0/portfetch.tcl 2011-09-30 17:23:30 UTC (rev 84756)
+++ branches/gsoc11-rev-upgrade/base/src/port1.0/portfetch.tcl 2011-09-30 17:24:30 UTC (rev 84757)
@@ -279,6 +279,7 @@
# Perform a bzr fetch
proc portfetch::bzrfetch {args} {
+ global patchfiles
if {[catch {command_exec bzr "" "2>&1"} result]} {
return -code error [msgcat::mc "Bazaar checkout failed"]
}
@@ -338,7 +339,7 @@
# Perform an svn fetch
proc portfetch::svnfetch {args} {
- global svn.args svn.method svn.revision svn.url
+ global svn.args svn.method svn.revision svn.url patchfiles
if {[regexp {\s} ${svn.url}]} {
return -code error [msgcat::mc "Subversion URL cannot contain whitespace"]
@@ -362,7 +363,7 @@
# Perform a git fetch
proc portfetch::gitfetch {args} {
- global worksrcpath
+ global worksrcpath patchfiles
global git.url git.branch git.sha1 git.cmd
set options "-q"
@@ -394,7 +395,7 @@
# Perform a mercurial fetch.
proc portfetch::hgfetch {args} {
- global worksrcpath prefix_frozen
+ global worksrcpath prefix_frozen patchfiles
global hg.url hg.tag hg.cmd
set cmdstring "${hg.cmd} clone --rev ${hg.tag} ${hg.url} ${worksrcpath} 2>&1"
Modified: branches/gsoc11-rev-upgrade/base/src/port1.0/portlint.tcl
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/port1.0/portlint.tcl 2011-09-30 17:23:30 UTC (rev 84756)
+++ branches/gsoc11-rev-upgrade/base/src/port1.0/portlint.tcl 2011-09-30 17:24:30 UTC (rev 84757)
@@ -43,6 +43,7 @@
"homepage" \
"master_sites" \
"checksums" \
+ "license"
]
set lint_optional [list \
@@ -289,7 +290,7 @@
global version revision epoch
set portarch [get_canonical_archs]
global description long_description platforms categories all_variants
- global maintainers homepage master_sites checksums patchfiles
+ global maintainers license homepage master_sites checksums patchfiles
global depends_fetch depends_extract depends_lib depends_build depends_run distfiles fetch.type
global lint_portsystem lint_platforms
@@ -500,6 +501,11 @@
incr warnings
}
+ if {[string match "unknown" $license]} {
+ ui_error "$license license"
+ incr errors
+ }
+
# these checks are only valid for ports stored in the regular tree directories
if {[info exists category] && $portcatdir != $category} {
ui_error "Portfile parent directory $portcatdir does not match primary category $category"
Modified: branches/gsoc11-rev-upgrade/base/src/port1.0/portutil.tcl
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/port1.0/portutil.tcl 2011-09-30 17:23:30 UTC (rev 84756)
+++ branches/gsoc11-rev-upgrade/base/src/port1.0/portutil.tcl 2011-09-30 17:24:30 UTC (rev 84757)
@@ -1511,7 +1511,7 @@
ui_debug "Skipping $target ($subport) since this port is already installed"
return 0
} elseif {$target == "activate"} {
- set regref [registry_open $subport $version $revision $portvariants $epoch]
+ set regref [registry_open $subport $version $revision $portvariants ""]
if {[registry_prop_retr $regref active] != 0} {
# Something to close the registry entry may be called here, if it existed.
ui_debug "Skipping $target ($subport @${version}_${revision}${portvariants}) since this port is already active"
Modified: branches/gsoc11-rev-upgrade/base/src/registry2.0/portimage.tcl
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/registry2.0/portimage.tcl 2011-09-30 17:23:30 UTC (rev 84756)
+++ branches/gsoc11-rev-upgrade/base/src/registry2.0/portimage.tcl 2011-09-30 17:24:30 UTC (rev 84757)
@@ -576,10 +576,14 @@
array set precious_dirs { /Library/LaunchDaemons 1 /Library/LaunchAgents 1 }
proc _deactivate_file {dstfile} {
- if { [::file type $dstfile] == "link" } {
+ if {[catch {::file type $dstfile} filetype]} {
+ ui_debug "$dstfile does not exist"
+ return
+ }
+ if { $filetype == "link" } {
ui_debug "deactivating link: $dstfile"
- ::file delete -- $dstfile
- } elseif { [::file isdirectory $dstfile] } {
+ file delete -- $dstfile
+ } elseif { $filetype == "directory" } {
# 0 item means empty.
if { [llength [readdir $dstfile]] == 0 } {
variable precious_dirs
Property changes on: branches/gsoc11-rev-upgrade/base/src/registry2.0/receipt_sqlite.tcl
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base/src/registry1.0/receipt_sqlite.tcl:37343-46937
/branches/gsoc09-logging/base/src/registry1.0/receipt_sqlite.tcl:51231-60371
/branches/universal-sanity/base/src/registry1.0/receipt_sqlite.tcl:51872-52323
/branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/registry2.0/receipt_sqlite.tcl:78828-83524
/users/perry/base-bugs_and_notes/src/registry1.0/receipt_sqlite.tcl:45682-46060
/users/perry/base-select/src/registry1.0/receipt_sqlite.tcl:44044-44692
+ /branches/gsoc08-privileges/base/src/registry1.0/receipt_sqlite.tcl:37343-46937
/branches/gsoc09-logging/base/src/registry1.0/receipt_sqlite.tcl:51231-60371
/branches/universal-sanity/base/src/registry1.0/receipt_sqlite.tcl:51872-52323
/branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/src/registry2.0/receipt_sqlite.tcl:78828-84751
/users/perry/base-bugs_and_notes/src/registry1.0/receipt_sqlite.tcl:45682-46060
/users/perry/base-select/src/registry1.0/receipt_sqlite.tcl:44044-44692
Modified: branches/gsoc11-rev-upgrade/base/tests/Makefile
===================================================================
--- branches/gsoc11-rev-upgrade/base/tests/Makefile 2011-09-30 17:23:30 UTC (rev 84756)
+++ branches/gsoc11-rev-upgrade/base/tests/Makefile 2011-09-30 17:24:30 UTC (rev 84757)
@@ -1,6 +1,6 @@
include ../Mk/macports.autoconf.mk
-TESTS?=checksums-1 cvs-and-patchsites envvariables site-tags trace universal universal-2 xcodeversion dependencies-c dependencies-d dependencies-e case-insensitive-deactivate variants
+TESTS?=checksums-1 svn-and-patchsites envvariables site-tags trace universal universal-2 xcodeversion dependencies-c dependencies-d dependencies-e case-insensitive-deactivate variants
PWD=$(shell pwd)
Added: branches/gsoc11-rev-upgrade/base/tests/test/svn-and-patchsites/Portfile
===================================================================
--- branches/gsoc11-rev-upgrade/base/tests/test/svn-and-patchsites/Portfile (rev 0)
+++ branches/gsoc11-rev-upgrade/base/tests/test/svn-and-patchsites/Portfile 2011-09-30 17:24:30 UTC (rev 84757)
@@ -0,0 +1,39 @@
+# $Id$
+
+PortSystem 1.0
+
+name svn-and-patchsites
+version 1
+categories test
+maintainers nomaintainer
+description Test port for svn+distant patchfiles functionalities
+homepage http://www.macports.org/
+platforms darwin
+
+long_description ${description}
+
+fetch.type svn
+svn.url http://svn.pythonmac.org/altgraph/altgraph/tags/altgraph-0.7.0/
+worksrcdir altgraph-0.7.0
+
+patch_sites http://home.uchicago.edu/~dgc/sw/mutt/
+patchfiles patch-1.5.14.dgc.xlabel_ext.9
+checksums patch-1.5.14.dgc.xlabel_ext.9 md5 c5badc733020187b6677f31b343195e8
+
+# Set depends_fetch to be empty to remove the dependency on svn added by base,
+# as it is not available in the test suite. Otherwise MacPorts will try to
+# verify a subversion port exists.
+depends_fetch
+
+# disable the patch phase in case the svn code gets out of sync with the patch.
+patch {}
+extract {}
+configure {}
+build {}
+destroot {
+ system "touch ${destroot}${prefix}/lib/${name}"
+}
+
+test {
+ # test is actually running the fetch target
+}
Property changes on: branches/gsoc11-rev-upgrade/base/tests/test/svn-and-patchsites/Portfile
___________________________________________________________________
Added: svn:eol-style:native
+
Added: svn:keywords
+ Id
Added: branches/gsoc11-rev-upgrade/base/tests/test/svn-and-patchsites/master
===================================================================
--- branches/gsoc11-rev-upgrade/base/tests/test/svn-and-patchsites/master (rev 0)
+++ branches/gsoc11-rev-upgrade/base/tests/test/svn-and-patchsites/master 2011-09-30 17:24:30 UTC (rev 84757)
@@ -0,0 +1,7 @@
+---> Fetching svn-and-patchsites
+---> Attempting to fetch patch-1.5.14.dgc.xlabel_ext.9 from http://home.uchicago.edu/~dgc/sw/mutt/
+---> Verifying checksum(s) for svn-and-patchsites
+---> Extracting svn-and-patchsites
+---> Configuring svn-and-patchsites
+---> Building svn-and-patchsites
+---> Testing svn-and-patchsites
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110930/59d7b57f/attachment-0001.html>
More information about the macports-changes
mailing list