ports/166992: ports-mgmt/portupgrade - new maintainer/upstream, RUN_DEPENDS fix, PR updates

[Bryan Drewery]

>Number:         166992
>Category:       ports
>Synopsis:       ports-mgmt/portupgrade - new maintainer/upstream, RUN_DEPENDS fix, PR updates
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 16 13:30:12 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Bryan Drewery
>Release:        
>Organization:
>Environment:
>Description:
I've taken over the upstream maintaining for ports-mgmt/portupgrade.

The new upstream is at http://pkgtools.github.com

Attached is a patch to set me as port maintainer, update to the new distfile, and update the project URL. The distfile is the same version as currently being used.

This patch also fixes ports/165353 with the RUN_DEPENDS update for ruby 1.9. I did not bump PORTREVISION for this as it seems like a rarely used feature that needs this fix. I don't think most people would benefit from rebuilding.

I've also analyzed all of the open portupgrade PR. With exception to ports/104910, all are either fixed, not an issue, or are logged upstream and will be addressed separately there.

Fixed upstream for next release:

  ports/112818 - portupgrade -a fails to rebuild index
  ports/144769 - [PATCH] ports-mgmt/portupgrade should have a configuration option to specify that some packages should alwayse be build from source even when using -P.

Invalid PR:

   ports/129891 is not valid. It's been documented in UPDATING (20080208) that this case needs special handling in pkgtools.conf via ALT_DEPENDS.

These PR are purely upstream issues and not ports issues. They are logged at the upstream issue tracker and wil be addressed there:

  ports/147242 - ports-mgmt/portupgrade incorrectly remove old port when new one fails to compile
  ports/126140 - runtime error
  ports/127019 - failure seen as success during upgrade
  ports/127889 - portupgrade detects spurious failures and skips ports unnecessarily
  ports/129930 - portinstall tries to install dependencies twice
  ports/137958 - portupgrade fails with recursive dependency error
  ports/140008 - many papercut omissions on portupgrade man page
  ports/147242 - portupgrade incorrectly remove old port when new one fails to compile
  ports/149817 - portinstall -p option doesn't make packages of build dependencies
  ports/151662 - Broken handling of MOVED
  ports/162212 - portversion -r doesn't work
  ports/165226 - unnecessary source package retrieval


>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -u portupgrade-old/Makefile portupgrade/Makefile
--- portupgrade-old/Makefile	2012-02-21 23:20:42.000000000 -0600
+++ portupgrade/Makefile	2012-04-16 08:10:30.000000000 -0500
@@ -10,10 +10,10 @@
 PORTREVISION=	0
 PORTEPOCH=	2
 CATEGORIES=	ports-mgmt
-MASTER_SITES=	ftp://ftp.SpringDaemons.com/soft/
-DISTNAME=	pkgtools-${DISTVERSION}
+MASTER_SITES=	http://github.com/pkgtools/pkgtools/tarball/${GITVERSION}/
+DISTNAME=	pkgtools-pkgtools-${GITVERSION}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	bryan at shatow.net
 COMMENT=	FreeBSD ports/packages administration and management tool suite
 
 OPTIONS=	BDB4 "Use Berkeley DB >=2 as backend" on \
@@ -21,7 +21,9 @@
 
 CONFLICTS_INSTALL=	portupgrade-devel-*
 
-USE_BZIP2=	yes
+FETCH_ARGS=	-Fpr
+GITVERSION=	b99f3ce
+
 USE_RUBY=	yes
 
 USE_LDCONFIG=	${PREFIX}/lib/compat/pkg
@@ -64,6 +66,11 @@
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1
 .endif
 
+# parsedate is needed for date globbing
+.if ${RUBY_DEFAULT_VER} == "1.9"
+RUN_DEPENDS+=	${RUBY_SITELIBDIR}/parsedate.rb:${PORTSDIR}/devel/ruby-date2
+.endif
+
 pre-extract:
 .if !defined(WITH_BDB4) && !defined(WITH_BDB1)
 	@${ECHO_MSG} "================================================================="
diff -u portupgrade-old/distinfo portupgrade/distinfo
--- portupgrade-old/distinfo	2011-08-23 05:15:01.000000000 -0500
+++ portupgrade/distinfo	2012-04-16 08:07:09.000000000 -0500
@@ -1,2 +1,2 @@
-SHA256 (pkgtools-2.4.9.3.tar.bz2) = a4492ee785822b2086c924a0857d627ebaba68d1a1d106c7e7839fe881a6c424
-SIZE (pkgtools-2.4.9.3.tar.bz2) = 79394
+SHA256 (pkgtools-pkgtools-b99f3ce.tar.gz) = bc60131071eb8b71493c1a0af756184ce4f5d535d971a60f7f1d02a4d0efb345
+SIZE (pkgtools-pkgtools-b99f3ce.tar.gz) = 98949
diff -u portupgrade-old/pkg-descr portupgrade/pkg-descr
--- portupgrade-old/pkg-descr	2011-08-18 20:02:23.000000000 -0500
+++ portupgrade/pkg-descr	2012-04-16 08:06:57.000000000 -0500
@@ -20,6 +20,6 @@
 pkgdu:		Display a disk usage for installed packages.
 
 Author: Akinori MUSHA <knu at FreeBSD.org> (Not the current maintainer)
-Maintainer: freebsd-ruby mailing list <ruby at FreeBSD.org>
-WWW: https://github.com/stass/pkgtools
+Maintainer: Bryan Drewery <bryan at shatow.net>
+WWW: http://pkgtools.github.com/
 WWW: http://wiki.freebsd.org/portupgrade


>Release-Note:
>Audit-Trail:
>Unformatted: