From owner-svn-ports-all@FreeBSD.ORG  Thu Apr 25 08:34:19 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id E429F161;
 Thu, 25 Apr 2013 08:34:19 +0000 (UTC) (envelope-from knu@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D561515BF;
 Thu, 25 Apr 2013 08:34:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3P8YJ4D071375;
 Thu, 25 Apr 2013 08:34:19 GMT (envelope-from knu@svn.freebsd.org)
Received: (from knu@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3P8YJ6g071374;
 Thu, 25 Apr 2013 08:34:19 GMT (envelope-from knu@svn.freebsd.org)
Message-Id: <201304250834.r3P8YJ6g071374@svn.freebsd.org>
From: Akinori MUSHA <knu@FreeBSD.org>
Date: Thu, 25 Apr 2013 08:34:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r316506 - head/databases/ruby-bdb
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Thu, 25 Apr 2013 08:34:20 -0000

Author: knu
Date: Thu Apr 25 08:34:19 2013
New Revision: 316506
URL: http://svnweb.freebsd.org/changeset/ports/316506

Log:
  - Fix problem that options dialog is popd up even if there is already
    saved file.
  
  - Remove CONFLICTS because it matches databases/ruby-bdb itself
    (Spotted by portlint).
  
  PR:		ports/178107
  Submitted by:	Yasuhiro KIMURA <yasu@utahime.org>

Modified:
  head/databases/ruby-bdb/Makefile

Modified: head/databases/ruby-bdb/Makefile
==============================================================================
--- head/databases/ruby-bdb/Makefile	Thu Apr 25 06:48:09 2013	(r316505)
+++ head/databases/ruby-bdb/Makefile	Thu Apr 25 08:34:19 2013	(r316506)
@@ -18,9 +18,8 @@ COMMENT=	Ruby interface to Oracle Berkel
 USE_BDB=	yes
 USE_BZIP2=	yes
 
-CONFLICTS=	${PKGNAMEPREFIX}${PORTNAME}[2-4]*
-
 OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONSFILE=	${PORT_DBDIR}/ruby-${PORTNAME}/options
 
 USE_RUBY=		yes
 USE_RUBY_EXTCONF=	yes