summaryrefslogtreecommitdiff
path: root/ports-mgmt/portupgrade
diff options
context:
space:
mode:
authorSergey Matveychuk <sem@FreeBSD.org>2006-06-19 07:53:56 +0000
committerSergey Matveychuk <sem@FreeBSD.org>2006-06-19 07:53:56 +0000
commitcb37128c506a36a6cca5c5b3cc500ade93f039eb (patch)
treedf01c2b21bd5c32b197644e5468905cf1d277f2b /ports-mgmt/portupgrade
parentUpdate to 1.2.3, which is necessary for newest version of asterisk to (diff)
- Real fix of the last problem.
Notes
Notes: svn path=/head/; revision=165753
Diffstat (limited to 'ports-mgmt/portupgrade')
-rw-r--r--ports-mgmt/portupgrade/Makefile2
-rw-r--r--ports-mgmt/portupgrade/files/patch-bin-portsclean17
-rw-r--r--ports-mgmt/portupgrade/files/patch-bin-portupgrade14
3 files changed, 20 insertions, 13 deletions
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index 47131be7e080..c2e7fb56e6a2 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -7,7 +7,7 @@
PORTNAME= portupgrade
PORTVERSION= 2.1.4
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
diff --git a/ports-mgmt/portupgrade/files/patch-bin-portsclean b/ports-mgmt/portupgrade/files/patch-bin-portsclean
index 863516982d30..dd2c4d0de811 100644
--- a/ports-mgmt/portupgrade/files/patch-bin-portsclean
+++ b/ports-mgmt/portupgrade/files/patch-bin-portsclean
@@ -1,12 +1,11 @@
---- bin/portsclean.orig Mon Jun 19 11:21:30 2006
-+++ bin/portsclean Mon Jun 19 11:27:10 2006
-@@ -218,6 +218,9 @@
+--- bin/portsclean.orig Sun Jun 18 20:02:01 2006
++++ bin/portsclean Mon Jun 19 11:50:54 2006
+@@ -141,6 +141,8 @@
- def distclean(level)
- return if level <= 0
-+
-+ level = 1 if level == 2
-+ level = 2 if level > 2
+ dry_parse = false
- puts "Detecting unreferenced distfiles..."
++ $distclean = 0
++ $pkgclean = 0
+ opts.order!(argv)
+ if !$workclean && $distclean.zero? && $pkgclean.zero? && !$libclean
diff --git a/ports-mgmt/portupgrade/files/patch-bin-portupgrade b/ports-mgmt/portupgrade/files/patch-bin-portupgrade
index af901e09bda9..9f86ece3736f 100644
--- a/ports-mgmt/portupgrade/files/patch-bin-portupgrade
+++ b/ports-mgmt/portupgrade/files/patch-bin-portupgrade
@@ -1,6 +1,14 @@
--- bin/portupgrade.orig Sun Jun 18 19:14:02 2006
-+++ bin/portupgrade Sun Jun 18 23:46:40 2006
-@@ -716,7 +716,7 @@
++++ bin/portupgrade Mon Jun 19 11:49:42 2006
+@@ -513,6 +513,7 @@
+
+ dry_parse = false
+
++ $distclean = 0
+ opts.order!(argv)
+
+ if envopt = config_value(:PORTUPGRADE_ARGS)
+@@ -716,7 +717,7 @@
ntasks = upgrade_tasks.size + install_tasks.size
ctask = 0
@@ -9,7 +17,7 @@
config_tasks = upgrade_tasks.dup
config_tasks.concat(install_tasks)
-@@ -774,7 +774,7 @@
+@@ -774,7 +775,7 @@
cmdargs << 'ECHO_MSG=/usr/bin/true'
end