From owner-svn-ports-all@freebsd.org  Thu Nov 12 13:02:40 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 CDA1AA2B5E9;
 Thu, 12 Nov 2015 13:02:40 +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 96BFC1F54;
 Thu, 12 Nov 2015 13:02:40 +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 tACD2dRI026750;
 Thu, 12 Nov 2015 13:02:39 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tACD2dKB026749;
 Thu, 12 Nov 2015 13:02:39 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201511121302.tACD2dKB026749@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, 12 Nov 2015 13:02:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r401342 - head/devel/simian
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.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Nov 2015 13:02:40 -0000

Author: amdmi3
Date: Thu Nov 12 13:02:39 2015
New Revision: 401342
URL: https://svnweb.freebsd.org/changeset/ports/401342

Log:
  - Fix installation, install bin/simian from correct directory
  - Fix installation of mono files, INSTALL_PROGRAM fails as it can't strip PE executables
  - Switch to options helpers
  
  Approved by:	portmgr blanket

Modified:
  head/devel/simian/Makefile

Modified: head/devel/simian/Makefile
==============================================================================
--- head/devel/simian/Makefile	Thu Nov 12 12:54:30 2015	(r401341)
+++ head/devel/simian/Makefile	Thu Nov 12 13:02:39 2015	(r401342)
@@ -79,18 +79,16 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/xsl/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/simian.xsl ${STAGEDIR}${PREFIX}/share/xsl/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/simian/bin
-.if ${PORT_OPTIONS:MJAVA}
+	${INSTALL_SCRIPT} ${WRKDIR}/simian ${STAGEDIR}${PREFIX}/bin/simian
+
+do-install-JAVA-on:
 	${INSTALL_DATA} ${WRKSRC}/bin/simian-${PORTVERSION}.jar ${STAGEDIR}${PREFIX}/simian/bin
-.endif
-.if ${PORT_OPTIONS:MMONO}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/*.dll ${STAGEDIR}${PREFIX}/simian/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/simian-${PORTVERSION}.exe ${STAGEDIR}${PREFIX}/simian/bin
-.endif
-	${INSTALL_SCRIPT} ${WRKSRC}/simian ${STAGEDIR}${PREFIX}/bin/simian
-.if ${PORT_OPTIONS:MDOCS}
-	cd ${WRKSRC} \
-		&& ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/\{} \; \
-		&& ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} \{} ${STAGEDIR}${DOCSDIR}/\{} \;
-.endif
+
+do-install-MONO-on:
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/*.dll ${STAGEDIR}${PREFIX}/simian/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/simian-${PORTVERSION}.exe ${STAGEDIR}${PREFIX}/simian/bin
+
+do-install-DOCS-on:
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>