From owner-svn-ports-all@FreeBSD.ORG Wed Apr 8 17:19:22 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BC93C43A; Wed, 8 Apr 2015 17:19:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8ACACAAE; Wed, 8 Apr 2015 17:19:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t38HJMdF027330; Wed, 8 Apr 2015 17:19:22 GMT (envelope-from mich@FreeBSD.org) Received: (from mich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t38HJMXT027328; Wed, 8 Apr 2015 17:19:22 GMT (envelope-from mich@FreeBSD.org) Message-Id: <201504081719.t38HJMXT027328@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mich set sender to mich@FreeBSD.org using -f From: Michael Landin Hostbaek Date: Wed, 8 Apr 2015 17:19:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383584 - in head/ports-mgmt/portell: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Apr 2015 17:19:22 -0000 Author: mich Date: Wed Apr 8 17:19:21 2015 New Revision: 383584 URL: https://svnweb.freebsd.org/changeset/ports/383584 Log: - change dbm to bsddb - RUN_DEPENDS PR: 199294 Modified: head/ports-mgmt/portell/Makefile head/ports-mgmt/portell/files/patch-portell.py Modified: head/ports-mgmt/portell/Makefile ============================================================================== --- head/ports-mgmt/portell/Makefile Wed Apr 8 16:58:25 2015 (r383583) +++ head/ports-mgmt/portell/Makefile Wed Apr 8 17:19:21 2015 (r383584) @@ -10,6 +10,8 @@ MASTER_SITES= http://www.freebsdcluster. MAINTAINER= mich@FreeBSD.org COMMENT= Quick display of FreeBSD port descriptions +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb>0:${PORTSDIR}/databases/py-bsddb + USES= python zip NO_BUILD= yes Modified: head/ports-mgmt/portell/files/patch-portell.py ============================================================================== --- head/ports-mgmt/portell/files/patch-portell.py Wed Apr 8 16:58:25 2015 (r383583) +++ head/ports-mgmt/portell/files/patch-portell.py Wed Apr 8 17:19:21 2015 (r383584) @@ -3,6 +3,15 @@ $FreeBSD$ --- portell.py.orig +++ portell.py +@@ -6,7 +6,7 @@ + # Version: 0.2 + # Usage: portell.py + +-import sys, os, shelve ++import sys, os, bsddb + + try: + PORTELL_DB = os.environ['PORTELL_PATH'] @@ -14,12 +14,16 @@ PORTELL_DB = "/var/db/portell.db" @@ -24,3 +33,25 @@ $FreeBSD$ def update_db(msg): print msg +@@ -30,7 +34,7 @@ + os.unlink(PORTELL_DB + ".db") + + try: +- d = shelve.open(PORTELL_DB) ++ d = bsddb.btopen(PORTELL_DB, 'c') + fix_dbdb() + os.chmod(PORTELL_DB, 0666) + except: +@@ -63,10 +67,10 @@ + else: + portname = sys.argv[1] + +- d = shelve.open(PORTELL_DB) ++ d = bsddb.btopen(PORTELL_DB, 'r') + fix_dbdb() + +- if d.has_key(portname): ++ if d.has_key(portname): + if os.uname()[0].lower() == "freebsd": + descr_path = d[portname] + "/pkg-descr" + else: