Index: head/ports-mgmt/portupgrade/files/patch-bin-portupgrade =================================================================== --- head/ports-mgmt/portupgrade/files/patch-bin-portupgrade (revision 207013) +++ head/ports-mgmt/portupgrade/files/patch-bin-portupgrade (nonexistent) @@ -1,32 +0,0 @@ -Index: bin/portupgrade -=================================================================== -RCS file: /cvsroot/portupgrade/pkgtools/bin/portupgrade,v -retrieving revision 1.49 -retrieving revision 1.50 -diff -u -r1.49 -r1.50 ---- bin/portupgrade 4 Feb 2008 11:34:20 -0000 1.49 -+++ bin/portupgrade 10 Feb 2008 12:04:39 -0000 1.50 -@@ -617,7 +617,11 @@ - not_need_upgrade = [] - upgrade_tasks.each do |task| - pkg = PkgInfo.new(task) -- origin = $pkgdb.origin(task) -+ if task == first && $origin -+ origin = $origin -+ else -+ origin = $pkgdb.origin(task) -+ end - if !origin.nil? - begin - name = get_pkgname(origin) -@@ -625,6 +629,10 @@ - $results << PkgResult.new(origin, :ignored, e.message) - not_need_upgrade << task - next -+ rescue PortDirError => e -+ $results << PkgResult.new(origin, :ignored, e.message) -+ not_need_upgrade << task -+ next - end - if name == '' - warning_message "There are errors in a meta info for #{task}" Property changes on: head/ports-mgmt/portupgrade/files/patch-bin-portupgrade ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.10 \ 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 207013) +++ head/ports-mgmt/portupgrade/Makefile (revision 207014) @@ -1,96 +1,95 @@ # New ports collection makefile for: portupgrade # Date created: 18 March 2001 # Whom: Akinori MUSHA aka knu # # $FreeBSD$ # PORTNAME= portupgrade -PORTVERSION= 2.4.2 -PORTREVISION= 1 +PORTVERSION= 2.4.3 PORTEPOCH= 2 CATEGORIES= ports-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= pkgtools-${DISTVERSION} MAINTAINER= sem@FreeBSD.org COMMENT= FreeBSD ports/packages administration and management tool suite OPTIONS= BDB4 "Use Berkeley DB >=2 as backend" on \ BDB1 "Use Berkeley DB 1.85 as backend" off CONFLICTS= portupgrade-devel-* USE_BZIP2= yes USE_RUBY= yes USE_RUBY_FEATURES= optparse ruby18 USE_PERL5_RUN= yes USE_LDCONFIG= ${PREFIX}/lib/compat/pkg LDCONFIG_DIRS= %%PREFIX%%/lib/compat/pkg 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 EXAMPLESDIR= ${PREFIX}/share/examples/pkgtools DOCSDIR= ${PREFIX}/share/doc/pkgtools INSTALL_TARGET= install .if !defined(NOPORTDOCS) INSTALL_TARGET+= install-doc .endif .include .include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk" .if defined(WITH_BDB4) # For PKG_DBDRIVER={bdb_btree,bdb_hash} RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb .endif .if defined(WITH_BDB1) && !defined(WITH_BDB4) # For PKG_DBDRIVER={bdb1_btree,bdb1_hash} RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1 .endif pre-extract: .if !defined(WITH_BDB4) && !defined(WITH_BDB1) @${ECHO_MSG} "=================================================================" @${ECHO_MSG} "Neither WITH_BDB4 nor WITH_BDB1 are defined. Will use DBD driver." @${ECHO_MSG} "=================================================================" .endif .if defined(WITH_BDB4) && defined(WITH_BDB1) @${ECHO_MSG} "=================================================================" @${ECHO_MSG} "Both WITH_BDB4 and WITH_BDB1 are defined. Will use BDB4 driver." @${ECHO_MSG} "=================================================================" .elif defined(WITH_BDB1) && exists(${RUBY_SITEARCHLIBDIR}/bdb.so) @${ECHO_MSG} "=================================================================" @${ECHO_MSG} "WITH_BDB1 is defined but ruby-bdb port installed." @${ECHO_MSG} "Remove ruby-bdb or redefine options." @${ECHO_MSG} "=================================================================" @exit 1 .endif post-install: install-ldconfig-file if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \ ${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \ fi ${MKDIR} ${PREFIX}/lib/compat/pkg ${CAT} ${PKGMESSAGE} .include Property changes on: head/ports-mgmt/portupgrade/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.246 \ No newline at end of property +1.247 \ No newline at end of property Index: head/ports-mgmt/portupgrade/distinfo =================================================================== --- head/ports-mgmt/portupgrade/distinfo (revision 207013) +++ head/ports-mgmt/portupgrade/distinfo (revision 207014) @@ -1,3 +1,3 @@ -MD5 (pkgtools-2.4.2.tar.bz2) = b812cc55ed3adb681ef93ff5d4674fbd -SHA256 (pkgtools-2.4.2.tar.bz2) = c04943949eee29d1ae3a180bd9925889974d1fb4c908545f009065770abd2d34 -SIZE (pkgtools-2.4.2.tar.bz2) = 112921 +MD5 (pkgtools-2.4.3.tar.bz2) = ad834bac92a2e3f2a0cfbf899e267c0c +SHA256 (pkgtools-2.4.3.tar.bz2) = 5060f4c38a8e6728eae450a46ecdf9ec4971c70b5b731f82e824a4b7fdbdf259 +SIZE (pkgtools-2.4.3.tar.bz2) = 113215 Property changes on: head/ports-mgmt/portupgrade/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.171 \ No newline at end of property +1.172 \ No newline at end of property Index: head/ports-mgmt/portupgrade-devel/Makefile =================================================================== --- head/ports-mgmt/portupgrade-devel/Makefile (revision 207013) +++ head/ports-mgmt/portupgrade-devel/Makefile (revision 207014) @@ -1,92 +1,92 @@ # New ports collection makefile for: portupgrade # Date created: 18 March 2001 # Whom: Akinori MUSHA aka knu # # $FreeBSD$ # PORTNAME= portupgrade-devel -PORTVERSION= 2.4.2 +PORTVERSION= 2.4.3 CATEGORIES= ports-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= portupgrade DISTNAME= pkgtools-${DISTVERSION} MAINTAINER= sem@FreeBSD.org COMMENT= FreeBSD ports/packages administration and management tool suite (devel version) OPTIONS= BDB4 "Use Berkeley DB >=2 as backend" on \ BDB1 "Use Berkeley DB 1.85 as backend" off CONFLICTS= portupgrade-[0-9]* USE_BZIP2= yes USE_RUBY= yes USE_RUBY_FEATURES= optparse ruby18 USE_PERL5_RUN= yes USE_LDCONFIG= ${PREFIX}/lib/compat/pkg LDCONFIG_DIRS= %%PREFIX%%/lib/compat/pkg 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 EXAMPLESDIR= ${PREFIX}/share/examples/pkgtools DOCSDIR= ${PREFIX}/share/doc/pkgtools INSTALL_TARGET= install .if !defined(NOPORTDOCS) INSTALL_TARGET+= install-doc .endif .include .include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk" .if defined(WITH_BDB4) # For PKG_DBDRIVER={bdb_btree,bdb_hash} RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb .endif .if defined(WITH_BDB1) && !defined(WITH_BDB4) # For PKG_DBDRIVER={bdb1_btree,bdb1_hash} RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1 .endif pre-extract: .if !defined(WITH_BDB4) && !defined(WITH_BDB1) @${ECHO_MSG} "=================================================================" @${ECHO_MSG} "Neither WITH_BDB4 nor WITH_BDB1 are defined. Will use DBD driver." @${ECHO_MSG} "=================================================================" .endif .if defined(WITH_BDB4) && defined(WITH_BDB1) @${ECHO_MSG} "=================================================================" @${ECHO_MSG} "Both WITH_BDB4 and WITH_BDB1 are defined. Will use BDB4 driver." @${ECHO_MSG} "=================================================================" .elif defined(WITH_BDB1) && exists(${RUBY_SITEARCHLIBDIR}/bdb.so) @${ECHO_MSG} "=================================================================" @${ECHO_MSG} "WITH_BDB1 is defined but ruby-bdb port installed." @${ECHO_MSG} "Remove ruby-bdb or redefine options." @${ECHO_MSG} "=================================================================" @exit 1 .endif post-install: install-ldconfig-file 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.256 \ No newline at end of property +1.257 \ No newline at end of property Index: head/ports-mgmt/portupgrade-devel/distinfo =================================================================== --- head/ports-mgmt/portupgrade-devel/distinfo (revision 207013) +++ head/ports-mgmt/portupgrade-devel/distinfo (revision 207014) @@ -1,3 +1,3 @@ -MD5 (pkgtools-2.4.2.tar.bz2) = b812cc55ed3adb681ef93ff5d4674fbd -SHA256 (pkgtools-2.4.2.tar.bz2) = c04943949eee29d1ae3a180bd9925889974d1fb4c908545f009065770abd2d34 -SIZE (pkgtools-2.4.2.tar.bz2) = 112921 +MD5 (pkgtools-2.4.3.tar.bz2) = ad834bac92a2e3f2a0cfbf899e267c0c +SHA256 (pkgtools-2.4.3.tar.bz2) = 5060f4c38a8e6728eae450a46ecdf9ec4971c70b5b731f82e824a4b7fdbdf259 +SIZE (pkgtools-2.4.3.tar.bz2) = 113215 Property changes on: head/ports-mgmt/portupgrade-devel/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.178 \ No newline at end of property +1.179 \ No newline at end of property