From owner-svn-ports-head@freebsd.org  Thu May 26 09:03:47 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9B812B4BFC2;
 Thu, 26 May 2016 09:03:47 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 68C811FDB;
 Thu, 26 May 2016 09:03:47 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4Q93ko5054817;
 Thu, 26 May 2016 09:03:46 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4Q93kNN054816;
 Thu, 26 May 2016 09:03:46 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201605260903.u4Q93kNN054816@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 26 May 2016 09:03:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r415884 - head/devel/geoip-java
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.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 May 2016 09:03:47 -0000

Author: amdmi3
Date: Thu May 26 09:03:46 2016
New Revision: 415884
URL: https://svnweb.freebsd.org/changeset/ports/415884

Log:
  - Clarify LICENSE
  - Add LICENSE_FILE
  - Add NO_ARCH
  - Switch to options helpers
  - Cosmetic fixes

Modified:
  head/devel/geoip-java/Makefile

Modified: head/devel/geoip-java/Makefile
==============================================================================
--- head/devel/geoip-java/Makefile	Thu May 26 08:57:45 2016	(r415883)
+++ head/devel/geoip-java/Makefile	Thu May 26 09:03:46 2016	(r415884)
@@ -5,46 +5,44 @@ PORTVERSION=	1.2.8
 PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.maxmind.com/download/geoip/api/java/
+PKGNAMESUFFIX=	-java
 DISTNAME=	GeoIPJava-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java bindings for GeoIP API
 
-LICENSE=	LGPL21
+LICENSE=	LGPL20+ # source sayas LGPL20+, LICENSE saya LGPL21
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	GeoIP>=1.4.8:net/GeoIP
 
-PKGNAMESUFFIX:=	-java
 USES=		zip
 
-USE_JAVA=	YES
+USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-USE_ANT=	YES
+USE_ANT=	yes
 ALL_TARGET=	jar
+NO_ARCH=	yes
+
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
 PLIST_FILES=	%%JAVAJARDIR%%/maxmind-geoip-${PORTVERSION}.jar
 PORTDOCS=	*
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 pre-build:
 	@${CP} ${FILESDIR}/build.xml ${WRKSRC}
 
-post-build-script:
-.if ${PORT_OPTIONS:MDOCS}
-	cd ${WRKSRC} && \
-		${ANT} javadoc
-.endif
+post-build-DOCS-on:
+	cd ${WRKSRC} && ${ANT} javadoc
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/maxmind-geoip.jar \
 		${STAGEDIR}${JAVAJARDIR}/maxmind-geoip-${PORTVERSION}.jar
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/javadoc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
-.endif
 
 .include <bsd.port.mk>