From owner-svn-ports-all@FreeBSD.ORG  Sun Jul 29 22:21:31 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7776D106566B;
	Sun, 29 Jul 2012 22:21:31 +0000 (UTC)
	(envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 486BC8FC12;
	Sun, 29 Jul 2012 22:21:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6TMLVV1011495;
	Sun, 29 Jul 2012 22:21:31 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6TMLVsA011492;
	Sun, 29 Jul 2012 22:21:31 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201207292221.q6TMLVsA011492@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 29 Jul 2012 22:21:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r301696 - in head/ports-mgmt/pkg: . files
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Jul 2012 22:21:31 -0000

Author: bapt
Date: Sun Jul 29 22:21:30 2012
New Revision: 301696
URL: http://svn.freebsd.org/changeset/ports/301696

Log:
  add a fix to pkg2ng preventing losing track of some dependency origins leading
  to a failure of the conversion.
  
  Reported by:	Pierre Guinoiseau (via gitub issue #314)
  Tested by:	Pierre Guinoiseau

Added:
  head/ports-mgmt/pkg/files/
  head/ports-mgmt/pkg/files/patch-ports__pkg2ng   (contents, props changed)
Modified:
  head/ports-mgmt/pkg/Makefile

Modified: head/ports-mgmt/pkg/Makefile
==============================================================================
--- head/ports-mgmt/pkg/Makefile	Sun Jul 29 21:17:24 2012	(r301695)
+++ head/ports-mgmt/pkg/Makefile	Sun Jul 29 22:21:30 2012	(r301696)
@@ -7,6 +7,7 @@
 
 PORTNAME=	pkg
 DISTVERSION=	1.0-rc4
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/portmgr \
 		http://files.etoilebsd.net/pkg/

Added: head/ports-mgmt/pkg/files/patch-ports__pkg2ng
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ports-mgmt/pkg/files/patch-ports__pkg2ng	Sun Jul 29 22:21:30 2012	(r301696)
@@ -0,0 +1,46 @@
+--- ./ports/pkg2ng.orig	2012-07-20 22:06:38.000000000 +0200
++++ ./ports/pkg2ng	2012-07-30 00:16:30.916916951 +0200
+@@ -11,12 +11,12 @@
+ ARCH=$( uname -m )
+ failed_pkgs=""
+ MOVED=0
++DBDIR="/var/db"
++PKGDB="${DBDIR}/pkg"
++PKGBAK="${DBDIR}/pkg.bak"
+ 
+ for PKG in $( pkg_info -Ea )
+ do
+-	DBDIR="/var/db"
+-	PKGDB="${DBDIR}/pkg"
+-	PKGBAK="${DBDIR}/pkg.bak"
+ 	DB="${PKGDB}/${PKG}"
+ 	DESC="${DB}/+DESC"
+ 	if [ ! -e "${PKGBAK}" ]; then
+@@ -84,10 +84,6 @@
+ 		failed_pkgs="${failed_pkgs} ${PKG}"
+ 	else
+ 		rm -rf ${MANIFEST}
+-		if [ -e ${DB} ]; then
+-			mv ${DB} ${PKGBAK}/${PKG}
+-			MOVED=1
+-		fi
+ 	fi
+ 
+ 	rm -rf ${MDIR}
+@@ -101,6 +97,16 @@
+ 	echo "" >&2
+ 	echo "!!! Some packages failed to register !!!" >&2
+ 	echo "Failed packages: ${failed_pkgs}" >&2
++else
++	for PKG in $( pkg_info -Ea ); do
++		DB="${PKGDB}/${PKG}"
++		if [ -e ${DB} ]; then
++			mv ${DB} ${PKGBAK}/${PKG}
++			MOVED=1
++		fi
++	done
++	echo "Conversion has been successfully finished"
++	echo "Your old packages database has been moved to: ${PKGBAK}."
+ fi
+ 
+ # Delete the portupgrade pkgdb to avoid discrepencies. It will be auto recreated.