From owner-svn-ports-all@FreeBSD.ORG  Thu Dec 11 10:50:37 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 3F36ED8F;
 Thu, 11 Dec 2014 10:50:37 +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 2A8D8F5C;
 Thu, 11 Dec 2014 10:50:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBBAobOg068465;
 Thu, 11 Dec 2014 10:50:37 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBBAobhb068464;
 Thu, 11 Dec 2014 10:50:37 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201412111050.sBBAobhb068464@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 11 Dec 2014 10:50:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r374523 - head/graphics/libpano13
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 <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, 11 Dec 2014 10:50:37 -0000

Author: amdmi3
Date: Thu Dec 11 10:50:36 2014
New Revision: 374523
URL: https://svnweb.freebsd.org/changeset/ports/374523
QAT: https://qat.redports.org/buildarchive/r374523/

Log:
  - Add LICENSE
  - Properly OPTIONize java support
  
  PR:		191787
  Submitted by:	mazhe@alkumuna.eu
  Approved by:	maintainer timeout (vd, 5 months)

Modified:
  head/graphics/libpano13/Makefile

Modified: head/graphics/libpano13/Makefile
==============================================================================
--- head/graphics/libpano13/Makefile	Thu Dec 11 10:25:39 2014	(r374522)
+++ head/graphics/libpano13/Makefile	Thu Dec 11 10:50:36 2014	(r374523)
@@ -3,13 +3,16 @@
 
 PORTNAME=	libpano13
 PORTVERSION=	2.9.18
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics java
 MASTER_SITES=	SF/panotools/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	vd@FreeBSD.org
 COMMENT=	Cross-platform library behind Panorama Tools and other photo stitchers
 
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng15.so:${PORTSDIR}/graphics/png \
 		libtiff.so:${PORTSDIR}/graphics/tiff
@@ -29,15 +32,18 @@ INSTALL_TARGET=	install-strip
 
 USE_LDCONFIG=	yes
 
-.if !defined(WITHOUT_JAVA)
+OPTIONS_DEFINE=	JAVA
+OPTIONS_SUB=	yes
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MJAVA}
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 JAVA_OS=	native
 CONFIGURE_ARGS+=	--with-java=${JAVA_HOME}
-PLIST_SUB=	JAVA=""
 .else
 CONFIGURE_ARGS+=	--without-java
-PLIST_SUB=	JAVA="@comment "
 .endif
 
 .include <bsd.port.mk>