Index: head/ports-mgmt/portupgrade/files/patch-portsdb.rb =================================================================== --- head/ports-mgmt/portupgrade/files/patch-portsdb.rb (revision 125006) +++ head/ports-mgmt/portupgrade/files/patch-portsdb.rb (nonexistent) @@ -1,14 +0,0 @@ -Index: lib/portsdb.rb -=================================================================== -RCS file: /home/cvs/pkgtools/lib/portsdb.rb,v -retrieving revision 1.80 -diff -u -2 -r1.80 portsdb.rb ---- lib/portsdb.rb 30 Jun 2004 16:22:35 -0000 1.80 -+++ lib/portsdb.rb 12 Jul 2004 16:08:12 -0000 -@@ -550,5 +550,5 @@ - open_db_for_rebuild! - -- File.open(index_file) do |f| -+ open("| sort #{shelljoin(index_file)}") do |f| - f.each_with_index do |line, i| - lineno = i + 1 Property changes on: head/ports-mgmt/portupgrade/files/patch-portsdb.rb ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/ports-mgmt/portupgrade/files/patch-portupgrade =================================================================== --- head/ports-mgmt/portupgrade/files/patch-portupgrade (revision 125006) +++ head/ports-mgmt/portupgrade/files/patch-portupgrade (nonexistent) @@ -1,16 +0,0 @@ -Index: bin/portupgrade -=================================================================== -RCS file: /home/cvs/pkgtools/bin/portupgrade,v -retrieving revision 1.226 -diff -u -2 -r1.226 portupgrade ---- bin/portupgrade 30 Jun 2004 16:51:46 -0000 1.226 -+++ bin/portupgrade 6 Jul 2004 19:18:10 -0000 -@@ -1691,5 +1691,7 @@ - end - -- latest_pkg, pkgfile = *pkglist.max { |pkg, file| pkg } -+ latest_pkg, pkgfile = *pkglist.max { |(pkg1, file1), (pkg2, file2)| -+ pkg1 <=> pkg2 -+ } - - if latest_pkg Property changes on: head/ports-mgmt/portupgrade/files/patch-portupgrade ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.7 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/ports-mgmt/portupgrade/files/patch-pkgtools.rb =================================================================== --- head/ports-mgmt/portupgrade/files/patch-pkgtools.rb (revision 125006) +++ head/ports-mgmt/portupgrade/files/patch-pkgtools.rb (nonexistent) @@ -1,16 +0,0 @@ -Index: lib/pkgtools.rb -=================================================================== -RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v -retrieving revision 1.123 -diff -u -r1.123 pkgtools.rb ---- lib/pkgtools.rb 30 Jun 2004 16:24:12 -0000 1.123 -+++ lib/pkgtools.rb 2 Jul 2004 03:51:12 -0000 -@@ -82,7 +82,7 @@ - if !pattern.include?('/') - gtable[pattern] = value - end -- end -+ end if hash - - table = [otable, gtable] - end Property changes on: head/ports-mgmt/portupgrade/files/patch-pkgtools.rb ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.7 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/ports-mgmt/portupgrade/Makefile =================================================================== --- head/ports-mgmt/portupgrade/Makefile (revision 125006) +++ head/ports-mgmt/portupgrade/Makefile (revision 125007) @@ -1,74 +1,73 @@ # New ports collection makefile for: portupgrade # Date created: 18 March 2001 # Whom: Akinori MUSHA aka knu # # $FreeBSD$ # PORTNAME= portupgrade -PORTVERSION= 20040701 -PORTREVISION= 3 +PORTVERSION= 20041224 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= knu DISTNAME= pkgtools-${DISTVERSION} -DISTVERSION= 20040701 +DISTVERSION= 20041224 .if ${DISTVERSION} != ${PORTVERSION} PATCH_SITES= ${MASTER_SITES} PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR} PATCHFILES= ${DISTNAME}-${PORTVERSION}.diff.bz2 PATCH_DIST_STRIP= -p1 .endif MAINTAINER= knu@FreeBSD.org COMMENT= FreeBSD ports/packages administration and management tool suite RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1 # For PKG_DBDRIVER={bdb_btree,bdb_hash,bdb} # ${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb USE_BZIP2= yes USE_RUBY= yes USE_RUBY_FEATURES= optparse ruby18 MAKE_ARGS= PREFIX="${PREFIX}" RUBY="${RUBY}" MAN1= pkg_deinstall.1 \ pkg_fetch.1 \ pkg_glob.1 \ pkg_sort.1 \ pkgdb.1 \ portcvsweb.1 \ portsclean.1 \ portsdb.1 \ portupgrade.1 \ portversion.1 MAN5= pkgtools.conf.5 MLINKS= pkgdb.1 pkg_which.1 \ portupgrade.1 portinstall.1 \ portsdb.1 ports_glob.1 MANCOMPRESSED= maybe INSTALL_TARGET= install .if !defined(NOPORTDOCS) INSTALL_TARGET+= install-doc .endif .include # pkg_create(1) must support -b. (4.5-RELEASE or later) # XXX: PKG_CMD is not defined yet.. PKG_CREATE_OK!= /usr/sbin/pkg_create 2>&1 | ${GREP} ' -b ' || ${TRUE} .if empty(PKG_CREATE_OK) IGNORE= pkg_create does not support -b. Please update /usr/sbin/pkg_* to those of the latest RELENG_4 .endif post-install: if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \ ${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \ fi .include Property changes on: head/ports-mgmt/portupgrade/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.189 \ No newline at end of property +1.190 \ No newline at end of property Index: head/ports-mgmt/portupgrade/distinfo =================================================================== --- head/ports-mgmt/portupgrade/distinfo (revision 125006) +++ head/ports-mgmt/portupgrade/distinfo (revision 125007) @@ -1,2 +1,2 @@ -MD5 (pkgtools-20040701.tar.bz2) = a6f5601c43bafa6ce5bb6108e74bc362 -SIZE (pkgtools-20040701.tar.bz2) = 99351 +MD5 (pkgtools-20041224.tar.bz2) = 1c69732e569fa423152cc792d2c40113 +SIZE (pkgtools-20041224.tar.bz2) = 104308 Property changes on: head/ports-mgmt/portupgrade/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.151 \ No newline at end of property +1.152 \ No newline at end of property Index: head/ports-mgmt/portupgrade-devel/files/patch-portsdb.rb =================================================================== --- head/ports-mgmt/portupgrade-devel/files/patch-portsdb.rb (revision 125006) +++ head/ports-mgmt/portupgrade-devel/files/patch-portsdb.rb (nonexistent) @@ -1,14 +0,0 @@ -Index: lib/portsdb.rb -=================================================================== -RCS file: /home/cvs/pkgtools/lib/portsdb.rb,v -retrieving revision 1.80 -diff -u -2 -r1.80 portsdb.rb ---- lib/portsdb.rb 30 Jun 2004 16:22:35 -0000 1.80 -+++ lib/portsdb.rb 12 Jul 2004 16:08:12 -0000 -@@ -550,5 +550,5 @@ - open_db_for_rebuild! - -- File.open(index_file) do |f| -+ open("| sort #{shelljoin(index_file)}") do |f| - f.each_with_index do |line, i| - lineno = i + 1 Property changes on: head/ports-mgmt/portupgrade-devel/files/patch-portsdb.rb ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/ports-mgmt/portupgrade-devel/files/patch-portupgrade =================================================================== --- head/ports-mgmt/portupgrade-devel/files/patch-portupgrade (revision 125006) +++ head/ports-mgmt/portupgrade-devel/files/patch-portupgrade (nonexistent) @@ -1,16 +0,0 @@ -Index: bin/portupgrade -=================================================================== -RCS file: /home/cvs/pkgtools/bin/portupgrade,v -retrieving revision 1.226 -diff -u -2 -r1.226 portupgrade ---- bin/portupgrade 30 Jun 2004 16:51:46 -0000 1.226 -+++ bin/portupgrade 6 Jul 2004 19:18:10 -0000 -@@ -1691,5 +1691,7 @@ - end - -- latest_pkg, pkgfile = *pkglist.max { |pkg, file| pkg } -+ latest_pkg, pkgfile = *pkglist.max { |(pkg1, file1), (pkg2, file2)| -+ pkg1 <=> pkg2 -+ } - - if latest_pkg Property changes on: head/ports-mgmt/portupgrade-devel/files/patch-portupgrade ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.7 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/ports-mgmt/portupgrade-devel/files/patch-pkgtools.rb =================================================================== --- head/ports-mgmt/portupgrade-devel/files/patch-pkgtools.rb (revision 125006) +++ head/ports-mgmt/portupgrade-devel/files/patch-pkgtools.rb (nonexistent) @@ -1,16 +0,0 @@ -Index: lib/pkgtools.rb -=================================================================== -RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v -retrieving revision 1.123 -diff -u -r1.123 pkgtools.rb ---- lib/pkgtools.rb 30 Jun 2004 16:24:12 -0000 1.123 -+++ lib/pkgtools.rb 2 Jul 2004 03:51:12 -0000 -@@ -82,7 +82,7 @@ - if !pattern.include?('/') - gtable[pattern] = value - end -- end -+ end if hash - - table = [otable, gtable] - end Property changes on: head/ports-mgmt/portupgrade-devel/files/patch-pkgtools.rb ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.7 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/ports-mgmt/portupgrade-devel/Makefile =================================================================== --- head/ports-mgmt/portupgrade-devel/Makefile (revision 125006) +++ head/ports-mgmt/portupgrade-devel/Makefile (revision 125007) @@ -1,74 +1,73 @@ # New ports collection makefile for: portupgrade # Date created: 18 March 2001 # Whom: Akinori MUSHA aka knu # # $FreeBSD$ # PORTNAME= portupgrade -PORTVERSION= 20040701 -PORTREVISION= 3 +PORTVERSION= 20041224 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= knu DISTNAME= pkgtools-${DISTVERSION} -DISTVERSION= 20040701 +DISTVERSION= 20041224 .if ${DISTVERSION} != ${PORTVERSION} PATCH_SITES= ${MASTER_SITES} PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR} PATCHFILES= ${DISTNAME}-${PORTVERSION}.diff.bz2 PATCH_DIST_STRIP= -p1 .endif MAINTAINER= knu@FreeBSD.org COMMENT= FreeBSD ports/packages administration and management tool suite RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1 # For PKG_DBDRIVER={bdb_btree,bdb_hash,bdb} # ${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb USE_BZIP2= yes USE_RUBY= yes USE_RUBY_FEATURES= optparse ruby18 MAKE_ARGS= PREFIX="${PREFIX}" RUBY="${RUBY}" MAN1= pkg_deinstall.1 \ pkg_fetch.1 \ pkg_glob.1 \ pkg_sort.1 \ pkgdb.1 \ portcvsweb.1 \ portsclean.1 \ portsdb.1 \ portupgrade.1 \ portversion.1 MAN5= pkgtools.conf.5 MLINKS= pkgdb.1 pkg_which.1 \ portupgrade.1 portinstall.1 \ portsdb.1 ports_glob.1 MANCOMPRESSED= maybe INSTALL_TARGET= install .if !defined(NOPORTDOCS) INSTALL_TARGET+= install-doc .endif .include # pkg_create(1) must support -b. (4.5-RELEASE or later) # XXX: PKG_CMD is not defined yet.. PKG_CREATE_OK!= /usr/sbin/pkg_create 2>&1 | ${GREP} ' -b ' || ${TRUE} .if empty(PKG_CREATE_OK) IGNORE= pkg_create does not support -b. Please update /usr/sbin/pkg_* to those of the latest RELENG_4 .endif post-install: if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \ ${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \ fi .include Property changes on: head/ports-mgmt/portupgrade-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.189 \ No newline at end of property +1.190 \ No newline at end of property Index: head/ports-mgmt/portupgrade-devel/distinfo =================================================================== --- head/ports-mgmt/portupgrade-devel/distinfo (revision 125006) +++ head/ports-mgmt/portupgrade-devel/distinfo (revision 125007) @@ -1,2 +1,2 @@ -MD5 (pkgtools-20040701.tar.bz2) = a6f5601c43bafa6ce5bb6108e74bc362 -SIZE (pkgtools-20040701.tar.bz2) = 99351 +MD5 (pkgtools-20041224.tar.bz2) = 1c69732e569fa423152cc792d2c40113 +SIZE (pkgtools-20041224.tar.bz2) = 104308 Property changes on: head/ports-mgmt/portupgrade-devel/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.151 \ No newline at end of property +1.152 \ No newline at end of property Index: head/sysutils/portupgrade/files/patch-portsdb.rb =================================================================== --- head/sysutils/portupgrade/files/patch-portsdb.rb (revision 125006) +++ head/sysutils/portupgrade/files/patch-portsdb.rb (nonexistent) @@ -1,14 +0,0 @@ -Index: lib/portsdb.rb -=================================================================== -RCS file: /home/cvs/pkgtools/lib/portsdb.rb,v -retrieving revision 1.80 -diff -u -2 -r1.80 portsdb.rb ---- lib/portsdb.rb 30 Jun 2004 16:22:35 -0000 1.80 -+++ lib/portsdb.rb 12 Jul 2004 16:08:12 -0000 -@@ -550,5 +550,5 @@ - open_db_for_rebuild! - -- File.open(index_file) do |f| -+ open("| sort #{shelljoin(index_file)}") do |f| - f.each_with_index do |line, i| - lineno = i + 1 Property changes on: head/sysutils/portupgrade/files/patch-portsdb.rb ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/sysutils/portupgrade/files/patch-portupgrade =================================================================== --- head/sysutils/portupgrade/files/patch-portupgrade (revision 125006) +++ head/sysutils/portupgrade/files/patch-portupgrade (nonexistent) @@ -1,16 +0,0 @@ -Index: bin/portupgrade -=================================================================== -RCS file: /home/cvs/pkgtools/bin/portupgrade,v -retrieving revision 1.226 -diff -u -2 -r1.226 portupgrade ---- bin/portupgrade 30 Jun 2004 16:51:46 -0000 1.226 -+++ bin/portupgrade 6 Jul 2004 19:18:10 -0000 -@@ -1691,5 +1691,7 @@ - end - -- latest_pkg, pkgfile = *pkglist.max { |pkg, file| pkg } -+ latest_pkg, pkgfile = *pkglist.max { |(pkg1, file1), (pkg2, file2)| -+ pkg1 <=> pkg2 -+ } - - if latest_pkg Property changes on: head/sysutils/portupgrade/files/patch-portupgrade ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.7 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/sysutils/portupgrade/files/patch-pkgtools.rb =================================================================== --- head/sysutils/portupgrade/files/patch-pkgtools.rb (revision 125006) +++ head/sysutils/portupgrade/files/patch-pkgtools.rb (nonexistent) @@ -1,16 +0,0 @@ -Index: lib/pkgtools.rb -=================================================================== -RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v -retrieving revision 1.123 -diff -u -r1.123 pkgtools.rb ---- lib/pkgtools.rb 30 Jun 2004 16:24:12 -0000 1.123 -+++ lib/pkgtools.rb 2 Jul 2004 03:51:12 -0000 -@@ -82,7 +82,7 @@ - if !pattern.include?('/') - gtable[pattern] = value - end -- end -+ end if hash - - table = [otable, gtable] - end Property changes on: head/sysutils/portupgrade/files/patch-pkgtools.rb ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.7 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/sysutils/portupgrade/Makefile =================================================================== --- head/sysutils/portupgrade/Makefile (revision 125006) +++ head/sysutils/portupgrade/Makefile (revision 125007) @@ -1,74 +1,73 @@ # New ports collection makefile for: portupgrade # Date created: 18 March 2001 # Whom: Akinori MUSHA aka knu # # $FreeBSD$ # PORTNAME= portupgrade -PORTVERSION= 20040701 -PORTREVISION= 3 +PORTVERSION= 20041224 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= knu DISTNAME= pkgtools-${DISTVERSION} -DISTVERSION= 20040701 +DISTVERSION= 20041224 .if ${DISTVERSION} != ${PORTVERSION} PATCH_SITES= ${MASTER_SITES} PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR} PATCHFILES= ${DISTNAME}-${PORTVERSION}.diff.bz2 PATCH_DIST_STRIP= -p1 .endif MAINTAINER= knu@FreeBSD.org COMMENT= FreeBSD ports/packages administration and management tool suite RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1 # For PKG_DBDRIVER={bdb_btree,bdb_hash,bdb} # ${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb USE_BZIP2= yes USE_RUBY= yes USE_RUBY_FEATURES= optparse ruby18 MAKE_ARGS= PREFIX="${PREFIX}" RUBY="${RUBY}" MAN1= pkg_deinstall.1 \ pkg_fetch.1 \ pkg_glob.1 \ pkg_sort.1 \ pkgdb.1 \ portcvsweb.1 \ portsclean.1 \ portsdb.1 \ portupgrade.1 \ portversion.1 MAN5= pkgtools.conf.5 MLINKS= pkgdb.1 pkg_which.1 \ portupgrade.1 portinstall.1 \ portsdb.1 ports_glob.1 MANCOMPRESSED= maybe INSTALL_TARGET= install .if !defined(NOPORTDOCS) INSTALL_TARGET+= install-doc .endif .include # pkg_create(1) must support -b. (4.5-RELEASE or later) # XXX: PKG_CMD is not defined yet.. PKG_CREATE_OK!= /usr/sbin/pkg_create 2>&1 | ${GREP} ' -b ' || ${TRUE} .if empty(PKG_CREATE_OK) IGNORE= pkg_create does not support -b. Please update /usr/sbin/pkg_* to those of the latest RELENG_4 .endif post-install: if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \ ${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \ fi .include Property changes on: head/sysutils/portupgrade/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.189 \ No newline at end of property +1.190 \ No newline at end of property Index: head/sysutils/portupgrade/distinfo =================================================================== --- head/sysutils/portupgrade/distinfo (revision 125006) +++ head/sysutils/portupgrade/distinfo (revision 125007) @@ -1,2 +1,2 @@ -MD5 (pkgtools-20040701.tar.bz2) = a6f5601c43bafa6ce5bb6108e74bc362 -SIZE (pkgtools-20040701.tar.bz2) = 99351 +MD5 (pkgtools-20041224.tar.bz2) = 1c69732e569fa423152cc792d2c40113 +SIZE (pkgtools-20041224.tar.bz2) = 104308 Property changes on: head/sysutils/portupgrade/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.151 \ No newline at end of property +1.152 \ No newline at end of property Index: head/sysutils/portupgrade-devel/files/patch-portsdb.rb =================================================================== --- head/sysutils/portupgrade-devel/files/patch-portsdb.rb (revision 125006) +++ head/sysutils/portupgrade-devel/files/patch-portsdb.rb (nonexistent) @@ -1,14 +0,0 @@ -Index: lib/portsdb.rb -=================================================================== -RCS file: /home/cvs/pkgtools/lib/portsdb.rb,v -retrieving revision 1.80 -diff -u -2 -r1.80 portsdb.rb ---- lib/portsdb.rb 30 Jun 2004 16:22:35 -0000 1.80 -+++ lib/portsdb.rb 12 Jul 2004 16:08:12 -0000 -@@ -550,5 +550,5 @@ - open_db_for_rebuild! - -- File.open(index_file) do |f| -+ open("| sort #{shelljoin(index_file)}") do |f| - f.each_with_index do |line, i| - lineno = i + 1 Property changes on: head/sysutils/portupgrade-devel/files/patch-portsdb.rb ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/sysutils/portupgrade-devel/files/patch-portupgrade =================================================================== --- head/sysutils/portupgrade-devel/files/patch-portupgrade (revision 125006) +++ head/sysutils/portupgrade-devel/files/patch-portupgrade (nonexistent) @@ -1,16 +0,0 @@ -Index: bin/portupgrade -=================================================================== -RCS file: /home/cvs/pkgtools/bin/portupgrade,v -retrieving revision 1.226 -diff -u -2 -r1.226 portupgrade ---- bin/portupgrade 30 Jun 2004 16:51:46 -0000 1.226 -+++ bin/portupgrade 6 Jul 2004 19:18:10 -0000 -@@ -1691,5 +1691,7 @@ - end - -- latest_pkg, pkgfile = *pkglist.max { |pkg, file| pkg } -+ latest_pkg, pkgfile = *pkglist.max { |(pkg1, file1), (pkg2, file2)| -+ pkg1 <=> pkg2 -+ } - - if latest_pkg Property changes on: head/sysutils/portupgrade-devel/files/patch-portupgrade ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.7 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/sysutils/portupgrade-devel/files/patch-pkgtools.rb =================================================================== --- head/sysutils/portupgrade-devel/files/patch-pkgtools.rb (revision 125006) +++ head/sysutils/portupgrade-devel/files/patch-pkgtools.rb (nonexistent) @@ -1,16 +0,0 @@ -Index: lib/pkgtools.rb -=================================================================== -RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v -retrieving revision 1.123 -diff -u -r1.123 pkgtools.rb ---- lib/pkgtools.rb 30 Jun 2004 16:24:12 -0000 1.123 -+++ lib/pkgtools.rb 2 Jul 2004 03:51:12 -0000 -@@ -82,7 +82,7 @@ - if !pattern.include?('/') - gtable[pattern] = value - end -- end -+ end if hash - - table = [otable, gtable] - end Property changes on: head/sysutils/portupgrade-devel/files/patch-pkgtools.rb ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.7 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/sysutils/portupgrade-devel/Makefile =================================================================== --- head/sysutils/portupgrade-devel/Makefile (revision 125006) +++ head/sysutils/portupgrade-devel/Makefile (revision 125007) @@ -1,74 +1,73 @@ # New ports collection makefile for: portupgrade # Date created: 18 March 2001 # Whom: Akinori MUSHA aka knu # # $FreeBSD$ # PORTNAME= portupgrade -PORTVERSION= 20040701 -PORTREVISION= 3 +PORTVERSION= 20041224 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= knu DISTNAME= pkgtools-${DISTVERSION} -DISTVERSION= 20040701 +DISTVERSION= 20041224 .if ${DISTVERSION} != ${PORTVERSION} PATCH_SITES= ${MASTER_SITES} PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR} PATCHFILES= ${DISTNAME}-${PORTVERSION}.diff.bz2 PATCH_DIST_STRIP= -p1 .endif MAINTAINER= knu@FreeBSD.org COMMENT= FreeBSD ports/packages administration and management tool suite RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1 # For PKG_DBDRIVER={bdb_btree,bdb_hash,bdb} # ${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb USE_BZIP2= yes USE_RUBY= yes USE_RUBY_FEATURES= optparse ruby18 MAKE_ARGS= PREFIX="${PREFIX}" RUBY="${RUBY}" MAN1= pkg_deinstall.1 \ pkg_fetch.1 \ pkg_glob.1 \ pkg_sort.1 \ pkgdb.1 \ portcvsweb.1 \ portsclean.1 \ portsdb.1 \ portupgrade.1 \ portversion.1 MAN5= pkgtools.conf.5 MLINKS= pkgdb.1 pkg_which.1 \ portupgrade.1 portinstall.1 \ portsdb.1 ports_glob.1 MANCOMPRESSED= maybe INSTALL_TARGET= install .if !defined(NOPORTDOCS) INSTALL_TARGET+= install-doc .endif .include # pkg_create(1) must support -b. (4.5-RELEASE or later) # XXX: PKG_CMD is not defined yet.. PKG_CREATE_OK!= /usr/sbin/pkg_create 2>&1 | ${GREP} ' -b ' || ${TRUE} .if empty(PKG_CREATE_OK) IGNORE= pkg_create does not support -b. Please update /usr/sbin/pkg_* to those of the latest RELENG_4 .endif post-install: if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \ ${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \ fi .include Property changes on: head/sysutils/portupgrade-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.189 \ No newline at end of property +1.190 \ No newline at end of property Index: head/sysutils/portupgrade-devel/distinfo =================================================================== --- head/sysutils/portupgrade-devel/distinfo (revision 125006) +++ head/sysutils/portupgrade-devel/distinfo (revision 125007) @@ -1,2 +1,2 @@ -MD5 (pkgtools-20040701.tar.bz2) = a6f5601c43bafa6ce5bb6108e74bc362 -SIZE (pkgtools-20040701.tar.bz2) = 99351 +MD5 (pkgtools-20041224.tar.bz2) = 1c69732e569fa423152cc792d2c40113 +SIZE (pkgtools-20041224.tar.bz2) = 104308 Property changes on: head/sysutils/portupgrade-devel/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.151 \ No newline at end of property +1.152 \ No newline at end of property