From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 12 04:00:21 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94B39106564A for ; Sat, 12 May 2012 04:00:21 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 5D25A8FC0C for ; Sat, 12 May 2012 04:00:21 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q4C40Ltb057564 for ; Sat, 12 May 2012 04:00:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q4C40LBZ057563; Sat, 12 May 2012 04:00:21 GMT (envelope-from gnats) Resent-Date: Sat, 12 May 2012 04:00:21 GMT Resent-Message-Id: <201205120400.q4C40LBZ057563@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Bryan Drewery Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5F979106566C for ; Sat, 12 May 2012 03:55:10 +0000 (UTC) (envelope-from bryan@shatow.net) Received: from secure.xzibition.com (secure.xzibition.com [173.160.118.92]) by mx1.freebsd.org (Postfix) with ESMTP id EB7878FC08 for ; Sat, 12 May 2012 03:55:09 +0000 (UTC) Received: (qmail 94168 invoked from network); 11 May 2012 22:55:06 -0500 Received: from unknown (HELO test8.xzibition.com) (10.10.0.34) by sweb.xzibition.com with SMTP; 11 May 2012 22:55:06 -0500 Received: by test8.xzibition.com (sSMTP sendmail emulation); Fri, 11 May 2012 22:54:50 -0500 Message-Id: <20120512035510.5F979106566C@hub.freebsd.org> Date: Fri, 11 May 2012 22:54:50 -0500 From: "Bryan Drewery" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/167811: [MAINTAINER] ports-mgmt/portupgrade-devel: Update to latest snapshot X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Bryan Drewery List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 May 2012 04:00:21 -0000 >Number: 167811 >Category: ports >Synopsis: [MAINTAINER] ports-mgmt/portupgrade-devel: Update to latest snapshot >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat May 12 04:00:21 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Bryan Drewery >Release: FreeBSD 8.3-RELEASE i386 >Organization: >Environment: >Description: Update to latest portupgrade development snapshot. Changes: - Fix portsdb -U crash when building INDEX - All libs are now installed into the pkgtools/ namespace - Experimental PKGNG support. portupgrade -o, pkgdb -F and package upgrades do not work yet. Enable with WITH_PKGNG=yes in /etc/make.conf >How-To-Repeat: >Fix: --- patch-portupgrade-devel.txt begins here --- diff -u /usr/ports/ports-mgmt/portupgrade-devel/Makefile ./Makefile --- /usr/ports/ports-mgmt/portupgrade-devel/Makefile 2012-05-02 10:50:24.000000000 -0500 +++ ./Makefile 2012-05-11 22:46:08.000000000 -0500 @@ -6,7 +6,7 @@ # PORTNAME= portupgrade -PORTVERSION= 20120501 +PORTVERSION= 20120511 PORTEPOCH= 3 CATEGORIES= ports-mgmt MASTER_SITES= http://github.com/pkgtools/pkgtools/tarball/${GITVERSION}/ \ @@ -24,7 +24,7 @@ CONFLICTS_INSTALL= portupgrade-[0-9]* FETCH_ARGS= -Fpr -GITVERSION= d0d4b68 +GITVERSION= 2048f18 USE_RUBY= yes USE_LDCONFIG= ${PREFIX}/lib/compat/pkg @@ -55,8 +55,8 @@ .endif post-patch: .SILENT - ${REINPLACE_CMD} '/PREFIX/s:\(=[[:space:]]*\)\(.*/usr/local\):\1ENV["LOCALBASE"] || \2:' \ - ${WRKSRC}/lib/pkgdb.rb ${WRKSRC}/lib/pkgtools.rb + REVISION=`readlink "${_DISTDIR}/portupgrade/latest" | ${SED} -E -e 's,.*pkgtools-(.*).tar.gz,\1,g'` && ${SED} -E -e "s,%%DATE%%,${PORTVERSION},g;s,%%REVISION%%,$${REVISION},g" \ + ${WRKSRC}/lib/pkgtools/revision.rb.in > ${WRKSRC}/lib/pkgtools/revision.rb post-install: if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \ diff -u /usr/ports/ports-mgmt/portupgrade-devel/distinfo ./distinfo --- /usr/ports/ports-mgmt/portupgrade-devel/distinfo 2012-05-02 10:50:24.000000000 -0500 +++ ./distinfo 2012-05-11 22:22:28.000000000 -0500 @@ -1,2 +1,2 @@ -SHA256 (pkgtools-pkgtools-d0d4b68.tar.gz) = 329579b6234837382bad45ab475d2250618e6829fc6d8a268a15534424e5b90f -SIZE (pkgtools-pkgtools-d0d4b68.tar.gz) = 99849 +SHA256 (pkgtools-pkgtools-2048f18.tar.gz) = 150727d88517f9fc2ecef1171103f8484dbf541b8adc7b7deab0bd90defe3b02 +SIZE (pkgtools-pkgtools-2048f18.tar.gz) = 101236 diff -u /usr/ports/ports-mgmt/portupgrade-devel/pkg-plist ./pkg-plist --- /usr/ports/ports-mgmt/portupgrade-devel/pkg-plist 2012-05-02 10:50:24.000000000 -0500 +++ ./pkg-plist 2012-05-11 17:12:08.000000000 -0500 @@ -15,17 +15,23 @@ sbin/portsdb sbin/portupgrade sbin/portversion -%%RUBY_SITELIBDIR%%/pkg.rb -%%RUBY_SITELIBDIR%%/pkgdb.rb -%%RUBY_SITELIBDIR%%/pkgdbtools.rb -%%RUBY_SITELIBDIR%%/pkginfo.rb -%%RUBY_SITELIBDIR%%/pkgmisc.rb +%%RUBY_SITELIBDIR%%/pkgtools/pkg.rb +%%RUBY_SITELIBDIR%%/pkgtools/pkgdb.rb +%%RUBY_SITELIBDIR%%/pkgtools/pkgdbtools.rb +%%RUBY_SITELIBDIR%%/pkgtools/pkginfo.rb +%%RUBY_SITELIBDIR%%/pkgtools/pkgmisc.rb +%%RUBY_SITELIBDIR%%/pkgtools/pkgtools.rb +%%RUBY_SITELIBDIR%%/pkgtools/pkgtsort.rb +%%RUBY_SITELIBDIR%%/pkgtools/pkgversion.rb +%%RUBY_SITELIBDIR%%/pkgtools/portinfo.rb +%%RUBY_SITELIBDIR%%/pkgtools/ports.rb +%%RUBY_SITELIBDIR%%/pkgtools/portsdb.rb +%%RUBY_SITELIBDIR%%/pkgtools/revision.rb %%RUBY_SITELIBDIR%%/pkgtools.rb -%%RUBY_SITELIBDIR%%/pkgtsort.rb -%%RUBY_SITELIBDIR%%/pkgversion.rb -%%RUBY_SITELIBDIR%%/portinfo.rb -%%RUBY_SITELIBDIR%%/ports.rb -%%RUBY_SITELIBDIR%%/portsdb.rb +@dirrm %%RUBY_SITELIBDIR%%/pkgtools +@dirrmtry %%RUBY_SITELIBDIR%% +@dirrmtry lib/ruby/site_ruby +@dirrmtry lib/ruby @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi etc/pkgtools.conf.sample @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf --- patch-portupgrade-devel.txt ends here --- >Release-Note: >Audit-Trail: >Unformatted: