Index: head/ports-mgmt/portupgrade/Makefile
===================================================================
--- head/ports-mgmt/portupgrade/Makefile	(revision 188082)
+++ head/ports-mgmt/portupgrade/Makefile	(revision 188083)
@@ -1,96 +1,96 @@
 # New ports collection makefile for:	portupgrade
 # Date created:		18 March 2001
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	portupgrade
 PORTVERSION=	2.2.6
-PORTREVISION=	2
+PORTREVISION=	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 <bsd.port.pre.mk>
 .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 <bsd.port.post.mk>

Property changes on: head/ports-mgmt/portupgrade/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.241
\ No newline at end of property
+1.242
\ No newline at end of property
Index: head/ports-mgmt/portupgrade/files/patch-lib-pkgmisc.rb
===================================================================
--- head/ports-mgmt/portupgrade/files/patch-lib-pkgmisc.rb	(revision 188082)
+++ head/ports-mgmt/portupgrade/files/patch-lib-pkgmisc.rb	(nonexistent)
@@ -1,17 +0,0 @@
-Index: lib/pkgmisc.rb
-===================================================================
-RCS file: /cvsroot/portupgrade/pkgtools/lib/pkgmisc.rb,v
-retrieving revision 1.2.2.2
-diff -u -r1.2.2.2 pkgmisc.rb
---- lib/pkgmisc.rb	24 Feb 2007 12:32:11 -0000	1.2.2.2
-+++ lib/pkgmisc.rb	2 Mar 2007 19:59:30 -0000
-@@ -93,7 +93,8 @@
- def shelljoin(*args)
-   args.collect { |arg|
-     if /[*?{}\[\]<>()~&|\\$;\'\`\"\s]/ =~ arg
--      '"' + arg.gsub(/([$\\\"\`])/, "\\\\\\1") + '"'
-+      a = '"' + arg.gsub(/([$\\\"\`])/, "\\\\\\1") + '"'
-+      a.gsub(/\s/, '" "')
-     else
-       arg
-     end

Property changes on: head/ports-mgmt/portupgrade/files/patch-lib-pkgmisc.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