From owner-svn-ports-head@FreeBSD.ORG  Thu Sep 25 20:52:28 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 E7A5C192;
 Thu, 25 Sep 2014 20:52:28 +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 D25F6E6E;
 Thu, 25 Sep 2014 20:52:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8PKqSdb092115;
 Thu, 25 Sep 2014 20:52:28 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8PKqS70092114;
 Thu, 25 Sep 2014 20:52:28 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201409252052.s8PKqS70092114@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Thu, 25 Sep 2014 20:52:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r369295 - head/java/java3d
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-1
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: Thu, 25 Sep 2014 20:52:29 -0000

Author: marino
Date: Thu Sep 25 20:52:28 2014
New Revision: 369295
URL: http://svnweb.freebsd.org/changeset/ports/369295
QAT: https://qat.redports.org/buildarchive/r369295/

Log:
  java/java3d: Set to dual GPLv2 and MIT licensing
  
  PR:		193186
  Submitted by:	pfg@
  
  After examining the LICENSE files in the existing tarball, Pedro came to
  the conclusion that the license is a combination between GPLv2 and some
  MIT-like licenses.  The package is redistributable; the outdated
  restriction is probably left over from a previous version, so it has
  been removed.

Modified:
  head/java/java3d/Makefile

Modified: head/java/java3d/Makefile
==============================================================================
--- head/java/java3d/Makefile	Thu Sep 25 20:41:37 2014	(r369294)
+++ head/java/java3d/Makefile	Thu Sep 25 20:52:28 2014	(r369295)
@@ -6,11 +6,13 @@ PORTVERSION=	1.5.2
 PORTREVISION=	3
 CATEGORIES=	java graphics games devel
 MASTER_SITES=	https://sites.google.com/site/daemonwizard/
-DISTNAME=	java3d-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Provides API for creating and manipulation of 3D geometry
 
+LICENSE=	GPLv2 MIT
+LICENSE_COMB=	multi
+
 USES=		tar:bzip2
 USE_JAVA=	yes
 USE_GL=		gl
@@ -24,8 +26,6 @@ PLIST_SUB+=	JAVA_HOME=${JAVA_HOME:S/^${P
 DOCSSRC=	${WRKSRC}/j3d-core/build/freebsd/javadocs/docs-public
 PORTDOCS=	*
 
-RESTRICTED=	License does not allow distribution
-
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>