From owner-svn-ports-all@FreeBSD.ORG Tue Jul 2 20:54:25 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 534E614F; Tue, 2 Jul 2013 20:54:25 +0000 (UTC) (envelope-from tota@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 359FE1684; Tue, 2 Jul 2013 20:54:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r62KsOe6084200; Tue, 2 Jul 2013 20:54:24 GMT (envelope-from tota@svn.freebsd.org) Received: (from tota@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r62KsON5084197; Tue, 2 Jul 2013 20:54:24 GMT (envelope-from tota@svn.freebsd.org) Message-Id: <201307022054.r62KsON5084197@svn.freebsd.org> From: TAKATSU Tomonari Date: Tue, 2 Jul 2013 20:54:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322204 - 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.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jul 2013 20:54:25 -0000 Author: tota Date: Tue Jul 2 20:54:23 2013 New Revision: 322204 URL: http://svnweb.freebsd.org/changeset/ports/322204 Log: - Update to 2.3.34 - Make use of LICENSE framework - Convert to new Options framework PR: ports/179657 (based on) Submitted by: John Marino Modified: head/devel/simian/Makefile head/devel/simian/distinfo head/devel/simian/pkg-plist Modified: head/devel/simian/Makefile ============================================================================== --- head/devel/simian/Makefile Tue Jul 2 20:47:29 2013 (r322203) +++ head/devel/simian/Makefile Tue Jul 2 20:54:23 2013 (r322204) @@ -2,27 +2,41 @@ # $FreeBSD$ PORTNAME= simian -PORTVERSION= 2.3.33 +PORTVERSION= 2.3.34 CATEGORIES= devel java MASTER_SITES= http://www.harukizaemon.com/simian/ MAINTAINER= tota@FreeBSD.org COMMENT= Similarity analyser for source and other text files +LICENSE= SIMIAN +LICENSE_NAME= SIMIAN SOFTWARE LICENSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -.if defined(WITHOUT_JAVA) && !defined(WITH_MONO) -WITH_MONO= yes -.endif - -.if defined(WITH_MONO) -RUN_DEPENDS+= mono:${PORTSDIR}/lang/mono -.endif +LICENSE_PERMS= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell no-auto-accept NO_BUILD= yes NO_WRKSUBDIR= yes -.if !defined(WITHOUT_JAVA) +RESTRICTED= Have to agree to license before download + +SUB_FILES= simian +SUB_LIST+= VERSION=${PORTVERSION} +PLIST_SUB+= VERSION=${PORTVERSION} + +PORTDOCS= changes.html customers.html features.html \ + get_dotnet.png get_it_now.html \ + get_java_blue-button.gif index.html installation.html \ + simian.jpg \ + javadoc + +OPTIONS_MULTI= LANG +OPTIONS_MULTI_LANG= JAVA MONO + +OPTIONS_DEFAULT= JAVA + +.include + +.if ${PORT_OPTIONS:MJAVA} USE_JAVA= yes JAVA_VERSION= 1.6+ PLIST_SUB+= JAVA="" @@ -32,7 +46,8 @@ PLIST_SUB+= JAVA="@comment " SUB_LIST+= JAVA="@comment " .endif -.if defined(WITH_MONO) +.if ${PORT_OPTIONS:MMONO} +RUN_DEPENDS+= mono:${PORTSDIR}/lang/mono PLIST_SUB+= MONO="" SUB_LIST+= MONO="" .else @@ -40,22 +55,6 @@ PLIST_SUB+= MONO="@comment " SUB_LIST+= MONO="@comment " .endif -RESTRICTED= Have to agree to license before download - -SUB_FILES= simian -SUB_LIST+= VERSION=${PORTVERSION} -PLIST_SUB+= VERSION=${PORTVERSION} - -.if !defined(NOPORTDOCS) -PORTDOCS= changes.html customers.html features.html \ - get_dotnet.png get_it_now.html \ - get_java_blue-button.gif index.html installation.html \ - simian.jpg \ - javadoc -.endif - -.include - pre-fetch: .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) .if !defined(PACKAGE_BUILDING) && (!defined(SIMIAN_AGREE_LICENSE) || ${SIMIAN_AGREE_LICENSE} != "yes") @@ -79,15 +78,15 @@ do-install: @${MKDIR} ${PREFIX}/share/xsl/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/simian.xsl ${PREFIX}/share/xsl/${PORTNAME} @${MKDIR} ${PREFIX}/simian/bin -.if !defined(WITHOUT_JAVA) +.if ${PORT_OPTIONS:MJAVA} ${INSTALL_DATA} ${WRKSRC}/bin/simian-${PORTVERSION}.jar ${PREFIX}/simian/bin .endif -.if defined(WITH_MONO) +.if ${PORT_OPTIONS:MMONO} ${INSTALL_PROGRAM} ${WRKSRC}/bin/*.dll ${PREFIX}/simian/bin ${INSTALL_PROGRAM} ${WRKSRC}/bin/simian-${PORTVERSION}.exe ${PREFIX}/simian/bin .endif ${INSTALL_SCRIPT} ${WRKSRC}/simian ${PREFIX}/bin/simian -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} cd ${WRKSRC} \ && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/\{} \; \ && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} \{} ${DOCSDIR}/\{} \; Modified: head/devel/simian/distinfo ============================================================================== --- head/devel/simian/distinfo Tue Jul 2 20:47:29 2013 (r322203) +++ head/devel/simian/distinfo Tue Jul 2 20:54:23 2013 (r322204) @@ -1,2 +1,2 @@ -SHA256 (simian-2.3.33.tar.gz) = 489c90dca3283d8c30778b9cdda0b992a23bb65d1ffdef7ef6c27ea2f3dbe529 -SIZE (simian-2.3.33.tar.gz) = 3271470 +SHA256 (simian-2.3.34.tar.gz) = 692d88eac13d87b53a6e2217c0213ba7be869288c01d90efe49b70581ceadcda +SIZE (simian-2.3.34.tar.gz) = 3577149 Modified: head/devel/simian/pkg-plist ============================================================================== --- head/devel/simian/pkg-plist Tue Jul 2 20:47:29 2013 (r322203) +++ head/devel/simian/pkg-plist Tue Jul 2 20:54:23 2013 (r322204) @@ -1,7 +1,10 @@ bin/simian %%JAVA%%simian/bin/simian-%%VERSION%%.jar %%MONO%%simian/bin/simian-%%VERSION%%.exe -%%MONO%%simian/bin/IKVM.GNU.Classpath.dll +%%MONO%%simian/bin/IKVM.OpenJDK.Core.dll +%%MONO%%simian/bin/IKVM.OpenJDK.Security.dll +%%MONO%%simian/bin/IKVM.OpenJDK.Text.dll +%%MONO%%simian/bin/IKVM.OpenJDK.Util.dll %%MONO%%simian/bin/IKVM.Runtime.dll share/xsl/simian/simian.xsl @dirrm simian/bin