From owner-svn-ports-head@freebsd.org  Fri Sep 11 19:51:56 2015
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 8197AA000AD;
 Fri, 11 Sep 2015 19:51:56 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 5617E15F0;
 Fri, 11 Sep 2015 19:51:56 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8BJpuFQ015822;
 Fri, 11 Sep 2015 19:51:56 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8BJpuTc015821;
 Fri, 11 Sep 2015 19:51:56 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201509111951.t8BJpuTc015821@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: Fri, 11 Sep 2015 19:51:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r396712 - head/textproc/lucene
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.20
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: Fri, 11 Sep 2015 19:51:56 -0000

Author: amdmi3
Date: Fri Sep 11 19:51:55 2015
New Revision: 396712
URL: https://svnweb.freebsd.org/changeset/ports/396712

Log:
  - Add NO_ARCH
  - Switch to options helpers
  - Don't install empty doc dirs
  
  Approved by:	portmgr blanket

Modified:
  head/textproc/lucene/Makefile

Modified: head/textproc/lucene/Makefile
==============================================================================
--- head/textproc/lucene/Makefile	Fri Sep 11 19:20:07 2015	(r396711)
+++ head/textproc/lucene/Makefile	Fri Sep 11 19:51:55 2015	(r396712)
@@ -20,6 +20,7 @@ PORTSCOUT=	limit:^3\.
 USES=		tar:tgz
 USE_JAVA=	yes
 NO_BUILD=	yes
+NO_ARCH=	yes
 JAVA_VERSION=	1.6+
 
 OPTIONS_DEFINE=	CONTRIB DOCS EXAMPLES
@@ -28,8 +29,6 @@ OPTIONS_DEFAULT=	CONTRIB
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}-core-${PORTVERSION}.jar
 
-.include <bsd.port.options.mk>
-
 CONTRIBS=	benchmark \
 		demo \
 		facet	\
@@ -55,11 +54,9 @@ EXTRA_CONTRIBS_DIRS=	kuromoji \
 		smartcn \
 		stempel
 
-.if ${PORT_OPTIONS:MCONTRIB}
 .for f in ${EXTRA_CONTRIBS_BASE} ${CONTRIBS} ${EXTRA_CONTRIBS_DIRS}
-PLIST_FILES+=%%JAVAJARDIR%%/${PORTNAME}-${f}-${PORTVERSION}.jar
+CONTRIB_PLIST_FILES+=	%%JAVAJARDIR%%/${PORTNAME}-${f}-${PORTVERSION}.jar
 .endfor
-.endif
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
@@ -68,24 +65,27 @@ DEMODIR=	contrib/demo
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-core-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}
-.if ${PORT_OPTIONS:MCONTRIB}
-. for f in ${CONTRIBS}
+
+do-install-CONTRIB-on:
+.for f in ${CONTRIBS}
 	${INSTALL_DATA} ${WRKSRC}/contrib/${f}/${PORTNAME}-${f}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}
-. endfor
-. for d in ${EXTRA_CONTRIBS_DIRS}
+.endfor
+.for d in ${EXTRA_CONTRIBS_DIRS}
 	${INSTALL_DATA} ${WRKSRC}/contrib/${EXTRA_CONTRIBS_BASE}/${d}/${PORTNAME}-${d}-${PORTVERSION}.jar \
 		${STAGEDIR}${JAVAJARDIR}
-. endfor
+.endfor
 	${INSTALL_DATA} \
 		${WRKSRC}/contrib/${EXTRA_CONTRIBS_BASE}/common/${PORTNAME}-${EXTRA_CONTRIBS_BASE}-${PORTVERSION}.jar \
 		${STAGEDIR}${JAVAJARDIR}
-.endif
 
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in CHANGES.txt LICENSE.txt NOTICE.txt README.txt
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} "-not -empty")
+
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/${DEMODIR} && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})