From owner-svn-ports-all@FreeBSD.ORG  Tue Dec 11 14:24:52 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 1101C8ED;
 Tue, 11 Dec 2012 14:24:52 +0000 (UTC)
 (envelope-from makc@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 E9DE08FC16;
 Tue, 11 Dec 2012 14:24:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBBEOp56014514;
 Tue, 11 Dec 2012 14:24:51 GMT (envelope-from makc@svn.freebsd.org)
Received: (from makc@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBBEOpIT014513;
 Tue, 11 Dec 2012 14:24:51 GMT (envelope-from makc@svn.freebsd.org)
Message-Id: <201212111424.qBBEOpIT014513@svn.freebsd.org>
From: Max Brazhnikov <makc@FreeBSD.org>
Date: Tue, 11 Dec 2012 14:24:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308698 - head/biology/babel
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: Tue, 11 Dec 2012 14:24:52 -0000

Author: makc
Date: Tue Dec 11 14:24:51 2012
New Revision: 308698
URL: http://svnweb.freebsd.org/changeset/ports/308698

Log:
  - Mark conflict with science/openbabel
  - Trim Makefile header

Modified:
  head/biology/babel/Makefile   (contents, props changed)

Modified: head/biology/babel/Makefile
==============================================================================
--- head/biology/babel/Makefile	Tue Dec 11 14:23:47 2012	(r308697)
+++ head/biology/babel/Makefile	Tue Dec 11 14:24:51 2012	(r308698)
@@ -1,13 +1,9 @@
-# New ports collection Makefile for:	babel
-# Date created:		Dec 4 1997
-# Whom:			frankch@waru.life.nthu.edu.tw
-#
+# Created by: frankch@waru.life.nthu.edu.tw
 # $FreeBSD$
-#
 
 PORTNAME=	babel
 PORTVERSION=	1.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	biology converters
 MASTER_SITES=	http://smog.com/chem/babel/files/ \
 		http://www.ccl.net/cca/software/UNIX/babel/
@@ -16,6 +12,8 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Converts among various molecular file formats
 
+CONFLICTS_INSTALL=	openbabel-*
+
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 
 post-build: