From owner-svn-ports-head@FreeBSD.ORG  Mon Jul 28 11:09:14 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C1F31204;
 Mon, 28 Jul 2014 11:09:14 +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 AFA2A2671;
 Mon, 28 Jul 2014 11:09:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6SB9EgN088410;
 Mon, 28 Jul 2014 11:09:14 GMT (envelope-from makc@svn.freebsd.org)
Received: (from makc@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6SB9ENg088409;
 Mon, 28 Jul 2014 11:09:14 GMT (envelope-from makc@svn.freebsd.org)
Message-Id: <201407281109.s6SB9ENg088409@svn.freebsd.org>
From: Max Brazhnikov <makc@FreeBSD.org>
Date: Mon, 28 Jul 2014 11:09:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r363131 - head/graphics/jogl
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Jul 2014 11:09:14 -0000

Author: makc
Date: Mon Jul 28 11:09:14 2014
New Revision: 363131
URL: http://svnweb.freebsd.org/changeset/ports/363131
QAT: https://qat.redports.org/buildarchive/r363131/

Log:
  graphics/jogl:
  - Remove CONFLICTS: jogamp-jogl doesn't coflict with jogl after recent update
  
  PR:		192172
  Approved by:	Peter Jeremy (maintainer)

Modified:
  head/graphics/jogl/Makefile

Modified: head/graphics/jogl/Makefile
==============================================================================
--- head/graphics/jogl/Makefile	Mon Jul 28 11:05:17 2014	(r363130)
+++ head/graphics/jogl/Makefile	Mon Jul 28 11:09:14 2014	(r363131)
@@ -3,7 +3,7 @@
 
 PORTNAME=	jogl
 PORTVERSION=	1.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics devel java
 MASTER_SITES=http://download.java.net/media/jogl/builds/archive/jsr-231-1.1.1/
 EXTRACT_SUFX=	-src.zip
@@ -14,8 +14,6 @@ COMMENT=	Java bindings for OpenGL
 LIB_DEPENDS=	libdrm.so:${PORTSDIR}/graphics/libdrm
 BUILD_DEPENDS=	${JAVALIBDIR}/antlr.jar:${PORTSDIR}/devel/antlr
 
-CONFLICTS=	jogamp-jogl-*
-
 NO_WRKSUBDIR=	yes
 
 DOCSDIR=	${JAVASHAREDIR}/${PORTNAME}