diff options
| author | Norikatsu Shigemura <nork@FreeBSD.org> | 2010-03-12 09:06:45 +0000 |
|---|---|---|
| committer | Norikatsu Shigemura <nork@FreeBSD.org> | 2010-03-12 09:06:45 +0000 |
| commit | be4219845f9183f51e36e8e7b379c8a571b7ef33 (patch) | |
| tree | 864d530e8c941474a27d6b9b9452ac50764c1fb3 | |
| parent | - Enable wide-character support by default (enabling UTF-8 text editing); (diff) | |
Don't install and/or build dependencies when only using packages.
PR: ports/143979
Submitted by: Bryan Drewery bryan at shatow net
Reviewed by: Yusuke Hoshizuki hoshizuki at chaos cs tsukuba ac jp
| -rw-r--r-- | ports-mgmt/portupgrade/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/files/patch-bin-portupgrade | 17 |
2 files changed, 16 insertions, 3 deletions
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index 3b648a267082..b39a3b5695a2 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -7,7 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 2.4.6 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 2 CATEGORIES= ports-mgmt MASTER_SITES= SF/${PORTNAME}/pkgtools/${PORTVERSION} diff --git a/ports-mgmt/portupgrade/files/patch-bin-portupgrade b/ports-mgmt/portupgrade/files/patch-bin-portupgrade index 9a4fd6564b1b..d085c4bbb022 100644 --- a/ports-mgmt/portupgrade/files/patch-bin-portupgrade +++ b/ports-mgmt/portupgrade/files/patch-bin-portupgrade @@ -1,5 +1,5 @@ ---- bin/portupgrade.orig 2009-07-21 23:59:59.000000000 +0400 -+++ bin/portupgrade 2009-07-22 00:02:08.000000000 +0400 +--- bin/portupgrade.orig 2008-07-01 20:32:25.000000000 +0900 ++++ bin/portupgrade 2010-03-12 17:58:41.298887026 +0900 @@ -597,6 +597,7 @@ exit 1 end @@ -22,3 +22,16 @@ begin pkg = PkgInfo.new(task) rescue ArgumentError => e +@@ -827,8 +828,12 @@ + # Returns: + # Set: all recursive depends list + def get_all_depends(origin, parents_list = nil) ++ if $use_packages_only ++ depends_vars = %w{LIB_DEPENDS RUN_DEPENDS} ++ else + depends_vars = %w{FETCH_DEPENDS EXTRACT_DEPENDS PATCH_DEPENDS + BUILD_DEPENDS LIB_DEPENDS RUN_DEPENDS} ++ end + + unless $depends.has_key?(origin) + depends = Set.new |