svn commit: r374523 - head/graphics/libpano13

[Dmitry Marakasov]

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 at 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 at 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>