aboutsummaryrefslogtreecommitdiff
path: root/ports-mgmt/portupgrade-devel
diff options
context:
space:
mode:
Diffstat (limited to 'ports-mgmt/portupgrade-devel')
-rw-r--r--ports-mgmt/portupgrade-devel/Makefile6
-rw-r--r--ports-mgmt/portupgrade-devel/distinfo1
-rw-r--r--ports-mgmt/portupgrade-devel/files/patch-pkgdb18
-rw-r--r--ports-mgmt/portupgrade-devel/files/patch-portupgrade99
4 files changed, 4 insertions, 120 deletions
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 5d28f599a2fe..a0ea7dffc70e 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= portupgrade
-PORTVERSION= 20030217
-PORTREVISION= 2
+PORTVERSION= 20030228
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
${MASTER_SITE_LOCAL}
@@ -19,7 +18,8 @@ DISTVERSION= 20030123
.if ${DISTVERSION} != ${PORTVERSION}
PATCH_SITES= ${MASTER_SITES}
PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR}
-PATCHFILES= ${DISTNAME}-${PORTVERSION}.diff.bz2
+PATCHFILES= ${DISTNAME}-20030217.diff.bz2 \
+ pkgtools-20030217-${PORTVERSION}.diff.bz2
PATCH_DIST_STRIP= -p1
.endif
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
index 11f177f3c9d0..8ceb5c996873 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1,2 +1,3 @@
MD5 (pkgtools-20030123.tar.bz2) = 2558438bfb4a1dbd6b20d9c10b54edfc
MD5 (pkgtools-20030123-20030217.diff.bz2) = 49875bb501e17827d6a2b66f212bcacd
+MD5 (pkgtools-20030217-20030228.diff.bz2) = 8752821d4687039a0dd91eb861330a4c
diff --git a/ports-mgmt/portupgrade-devel/files/patch-pkgdb b/ports-mgmt/portupgrade-devel/files/patch-pkgdb
deleted file mode 100644
index 4c39db724c09..000000000000
--- a/ports-mgmt/portupgrade-devel/files/patch-pkgdb
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: bin/pkgdb
-===================================================================
-RCS file: /home/cvs/pkgtools/bin/pkgdb,v
-retrieving revision 1.64
-retrieving revision 1.65
-diff -u -1 -r1.64 -r1.65
---- bin/pkgdb 16 Feb 2003 15:11:32 -0000 1.64
-+++ bin/pkgdb 18 Feb 2003 02:33:59 -0000 1.65
-@@ -29,3 +29,3 @@
-
--RCS_ID = %q$Idaemons: /home/cvs/pkgtools/bin/pkgdb,v 1.64 2003/02/16 15:11:32 knu Exp $
-+RCS_ID = %q$Idaemons: /home/cvs/pkgtools/bin/pkgdb,v 1.65 2003/02/18 02:33:59 knu Exp $
- RCS_REVISION = RCS_ID.split[2]
-@@ -392,3 +392,3 @@
- if !origin && /^bsdpan-(.*)/ =~ pkg.name and
-- ports = $portsdb.glob("p5-#{$1}")
-+ ports = $portsdb.glob("p5-#{$1}") and !ports.empty?
- special_guess = ports.first.origin
diff --git a/ports-mgmt/portupgrade-devel/files/patch-portupgrade b/ports-mgmt/portupgrade-devel/files/patch-portupgrade
deleted file mode 100644
index 96faf3071a1b..000000000000
--- a/ports-mgmt/portupgrade-devel/files/patch-portupgrade
+++ /dev/null
@@ -1,99 +0,0 @@
-Index: bin/portupgrade
-===================================================================
-RCS file: /home/cvs/pkgtools/bin/portupgrade,v
-retrieving revision 1.215
-retrieving revision 1.216
-diff -u -r1.215 -r1.216
---- bin/portupgrade 16 Feb 2003 16:23:57 -0000 1.215
-+++ bin/portupgrade 17 Feb 2003 20:00:57 -0000 1.216
-@@ -27,7 +27,7 @@
- # SUCH DAMAGE.
- #
-
--RCS_ID = %q$Idaemons: /home/cvs/pkgtools/bin/portupgrade,v 1.215 2003/02/16 16:23:57 knu Exp $
-+RCS_ID = %q$Idaemons: /home/cvs/pkgtools/bin/portupgrade,v 1.216 2003/02/17 20:00:57 knu Exp $
- RCS_REVISION = RCS_ID.split[2]
- MYNAME = File.basename($0)
-
-@@ -711,12 +711,11 @@
- if origin
- $make_args = options[:make_args] = get_make_args(origin, pkgname)
-
-- skip = false
--
- if result = $results[origin]
- progress_message "Skipping '#{origin}' (#{pkgname}) which has already #{result.phrase(true)}"
-
-- skip = true
-+ $results << PkgResult.new(origin, PkgResult::SKIPPED, pkgname)
-+ return
- elsif !$keep_going
- deps = pkg.pkgdep || []
-
-@@ -727,16 +726,11 @@
-
- if result && result.failed?
- progress_message "Skipping '#{origin}' (#{pkgname}) because '#{o}' (#{dep}) failed"
-- skip = true
-- break
-+ $results << PkgResult.new(origin, PkgResult::SKIPPED, pkgname)
-+ return
- end
- end
- end
--
-- if skip
-- $results << PkgResult.new(origin, PkgResult::SKIPPED, pkgname)
-- next
-- end
- end
-
- stty_sane
-@@ -784,11 +778,11 @@
-
- if $noexecute
- puts "OK? [no]" if $interactive
-- next
-+ return
- elsif $yestoall
- puts "OK? [yes]" if $interactive
- elsif $interactive
-- prompt_yesno('OK?', true) or next
-+ prompt_yesno('OK?', true) or return
- end
-
- system!(PkgDB::CMD[:pkg_create], '-vb', pkgname,
-@@ -797,12 +791,11 @@
- end
-
- def do_install(origin)
-- skip = false
--
- if result = $results[origin]
- progress_message "Skipping '#{origin}' which has already #{result.phrase(true)}"
-
-- skip = true
-+ $results << PkgResult.new(origin, PkgResult::SKIPPED)
-+ return
- else
- unless $keep_going
- make_args = get_make_args(origin)
-@@ -812,16 +805,11 @@
-
- if result && result.failed?
- progress_message "Skipping '#{origin}' because '#{o}' failed"
-- skip = true
-- break # not next
-+ $results << PkgResult.new(origin, PkgResult::SKIPPED)
-+ return
- end
- end
- end
-- end
--
-- if skip
-- $results << PkgResult.new(origin, PkgResult::SKIPPED)
-- next
- end
-
- stty_sane