Index: head/ports-mgmt/portupgrade-devel/Makefile =================================================================== --- head/ports-mgmt/portupgrade-devel/Makefile (revision 191300) +++ head/ports-mgmt/portupgrade-devel/Makefile (revision 191301) @@ -1,95 +1,93 @@ # New ports collection makefile for: portupgrade # Date created: 18 March 2001 # Whom: Akinori MUSHA aka knu # # $FreeBSD$ # PORTNAME= portupgrade-devel PORTVERSION= 2.3.0 -PORTREVISION= 3 +PORTREVISION= 4 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]* - -IGNORE= this version is a test of a new concept and don't ready for wide use 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.247 \ No newline at end of property +1.248 \ No newline at end of property Index: head/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade =================================================================== --- head/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade (revision 191300) +++ head/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade (revision 191301) @@ -1,51 +1,90 @@ -Index: bin/portupgrade -=================================================================== -RCS file: /cvsroot/portupgrade/pkgtools/bin/portupgrade,v -retrieving revision 1.30 -diff -u -r1.30 portupgrade ---- portupgrade 26 Feb 2007 16:00:26 -0000 1.30 -+++ portupgrade 4 Mar 2007 12:49:16 -0000 -@@ -616,7 +616,8 @@ +--- bin/portupgrade.orig Mon Feb 26 19:00:26 2007 ++++ bin/portupgrade Tue May 1 21:37:49 2007 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env ruby ++#!/usr/local/bin/ruby18 + # -*- ruby -*- + # + # Copyright (c) 2000-2004 Akinori MUSHA +@@ -616,7 +616,9 @@ # Track unistalled ports is appeared after updating upgrade_tasks.each do |task| - install_tasks |= get_uninstalled_depends($pkgdb.origin(task)) + o = $pkgdb.origin(task) -+ install_tasks |= get_uninstalled_depends(o) if !o.nil? ++#XXX install_tasks |= get_uninstalled_depends(o) if !o.nil? ++ $task_options[task][:origin] = o end } -@@ -701,7 +702,6 @@ +@@ -701,7 +703,6 @@ if $upward_recursive get_all_depends(origin).each do |o| - puts "*>#{o}" make_args = get_make_args(o) if pkgnames = $pkgdb.deorigin(o) -@@ -714,7 +714,6 @@ +@@ -714,7 +715,6 @@ } unless $task_options.include?(p) end else - puts "*->#{o}" install_tasks << o $task_options[o] = { :make_args => make_args, -@@ -831,7 +830,7 @@ +@@ -800,6 +800,9 @@ + unless $depends.has_key?(origin) + depends = Set.new ++ portdir = $portsdb.portdir(origin) ++ return nil if not File.directory?(portdir) ++ + first = false + if parents_list.nil? + parents_list = Set.new +@@ -809,8 +812,6 @@ + return nil if parents_list.include?(origin) + parents_list.add(origin) + +- portdir = $portsdb.portdir(origin) +- + make_env = get_make_env(origin) + cmdargs = make_env << 'make' + +@@ -831,7 +832,7 @@ + children_deps = Set.new depends.each do |dep| - children_deps.merge(get_all_depends(dep, parents_list)) + children_deps.merge(get_all_depends(dep, parents_list)) if !dep.nil? end if children_deps.nil? next -@@ -840,7 +839,7 @@ +@@ -840,7 +841,7 @@ end STDERR.puts ' done]' if first - $depends[origin] = depends + $depends[origin] = depends.to_a.compact else $depends[origin] end +@@ -907,7 +908,7 @@ + dependency = options[:dependency] + + origin = $origin +- if !origin ++ if !origin || !File.directory?($portsdb.ports_dir()+'/'+origin) + if !$ignore_moved and \ + !config_ignore_moved?(pkg) and \ + (moved = $portsdb.moved.trace(pkg.origin)) +@@ -917,6 +918,8 @@ + end + else + warning_message "Package '#{pkg.name}' has been removed from ports tree." ++ $results << PkgResult.new($origin, :ignored, pkgname) ++ return + end + else + origin = pkg.origin Property changes on: head/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.8 \ No newline at end of property +1.9 \ No newline at end of property Index: head/ports-mgmt/portupgrade-devel/files/patch-lib-pkgtools.rb =================================================================== --- head/ports-mgmt/portupgrade-devel/files/patch-lib-pkgtools.rb (nonexistent) +++ head/ports-mgmt/portupgrade-devel/files/patch-lib-pkgtools.rb (revision 191301) @@ -0,0 +1,12 @@ +--- lib/pkgtools.rb.orig Tue May 1 11:12:02 2007 ++++ lib/pkgtools.rb Tue May 1 11:12:16 2007 +@@ -646,6 +646,9 @@ + + # raises StandardError + def modify_pkgdep(pkgname, dep, newdep, neworigin = nil) ++ pkgdir = $pkgdb.pkgdir(pkgname) ++ return if pkgdir.nil? || !File.directory?(pkgdir) ++ + pkgver_re = %r{-\d\S*$} + file = $pkgdb.pkg_contents(pkgname) + Property changes on: head/ports-mgmt/portupgrade-devel/files/patch-lib-pkgtools.rb ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.3 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property