From f428599ca576864f47f846f72f01b4731c4f15c2 Mon Sep 17 00:00:00 2001 From: Doug Barton Date: Sat, 7 Jul 2012 12:16:20 +0000 Subject: [PATCH] Upgrade to version 3.13 Major updates/fixes to the distfile handling code ================================================= * Make all parts of the code SUBDIR-safe (most were already) - Fix a few places where the relativity of the cwd was not respected, most often resulting in files not being deleted that should be * Move the storage of the distfile info back to /var/db/pkg where it should have been all along. Mostly for correctness, but also to deal with the problem of non-UNIQUENAMEs causing the wrong files to be deleted with -d. * Clean up the old /var/db/ports/*/distfiles files after reading them, and delete the directory if it's empty. Since we are doing this unconditionally now, there is no longer a need for delete_dist_list(). The new ones will live and die with the rest of the package directory. * Update some of the messages printed out for distfile-related things to make it more clear what's going on. * Check DI_FILES to see if the distfile could be valid for another port in more places, so add a function to deal with the common ones. * When checking DI_FILES, anchor the grep pattern with a ^ to avoid false positives Other code changes ================== * Make the whitespace more consistent * Various minor improvements, mostly to avoid unnecessary forking UI Change ========= * When using -i and there is an +IGNOREME file, the default should be no --- ports-mgmt/portmaster/Makefile | 2 +- ports-mgmt/portmaster/distinfo | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile index 19c72a29f0c6..774c70b56dcd 100644 --- a/ports-mgmt/portmaster/Makefile +++ b/ports-mgmt/portmaster/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= portmaster -PORTVERSION= 3.12.2 +PORTVERSION= 3.13 CATEGORIES= ports-mgmt MASTER_SITES= http://dougbarton.us/Downloads/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc diff --git a/ports-mgmt/portmaster/distinfo b/ports-mgmt/portmaster/distinfo index e5b6fefaa0cc..09b1d81d82eb 100644 --- a/ports-mgmt/portmaster/distinfo +++ b/ports-mgmt/portmaster/distinfo @@ -1,4 +1,4 @@ -SHA256 (portmaster-3.12.2.tar.gz) = d69aa2282d8c91da362337a80598b54a71a749675f8c34b8b8efc0f4e047276a -SIZE (portmaster-3.12.2.tar.gz) = 41792 -SHA256 (portmaster-3.12.2.tar.gz.asc) = f6a853b096b49f29081164786b07777141eb6c3b4fe672dec1d32f13fc7cdd71 -SIZE (portmaster-3.12.2.tar.gz.asc) = 488 +SHA256 (portmaster-3.13.tar.gz) = b317e7c3b691a194e94abcf1e548b0dcf26088350344c3d3d0c4ddfa1a6b4b7b +SIZE (portmaster-3.13.tar.gz) = 41841 +SHA256 (portmaster-3.13.tar.gz.asc) = 634c6f4e1b86f02aa4c75018e49a2f786a1b281b4c94ba91050a6ead4b444d78 +SIZE (portmaster-3.13.tar.gz.asc) = 488