From owner-svn-ports-all@FreeBSD.ORG Mon Feb 2 22:56:48 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5B5BDD54; Mon, 2 Feb 2015 22:56:48 +0000 (UTC) Received: from svn.freebsd.org (svn.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 443F5DD; Mon, 2 Feb 2015 22:56:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12Mum4I041689; Mon, 2 Feb 2015 22:56:48 GMT (envelope-from nivit@FreeBSD.org) Received: (from nivit@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12MulLh041683; Mon, 2 Feb 2015 22:56:47 GMT (envelope-from nivit@FreeBSD.org) Message-Id: <201502022256.t12MulLh041683@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: nivit set sender to nivit@FreeBSD.org using -f From: Nicola Vitale Date: Mon, 2 Feb 2015 22:56:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378337 - in head/graphics/mapyrus: . files 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.18-1 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: Mon, 02 Feb 2015 22:56:48 -0000 Author: nivit Date: Mon Feb 2 22:56:46 2015 New Revision: 378337 URL: https://svnweb.freebsd.org/changeset/ports/378337 QAT: https://qat.redports.org/buildarchive/r378337/ Log: - Update to 1.401 - Sort variables - Use COPYTREE_SHARE to install examples Modified: head/graphics/mapyrus/Makefile head/graphics/mapyrus/distinfo head/graphics/mapyrus/files/mapyrus.in (contents, props changed) head/graphics/mapyrus/pkg-plist Modified: head/graphics/mapyrus/Makefile ============================================================================== --- head/graphics/mapyrus/Makefile Mon Feb 2 22:56:02 2015 (r378336) +++ head/graphics/mapyrus/Makefile Mon Feb 2 22:56:46 2015 (r378337) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= mapyrus -PORTVERSION= 1.302 -PORTREVISION= 1 +PORTVERSION= 1.401 +PORTREVISION= 0 CATEGORIES= graphics print java MASTER_SITES= SF @@ -12,34 +12,33 @@ COMMENT= Software for creating plots of LICENSE= LGPL21 -NO_BUILD= yes -NO_WRKSUBDIR= yes +DATADIR= ${JAVASHAREDIR}/${PORTNAME} -USE_JAVA= yes JAVA_VERSION= 1.6+ -USES= zip - -DATADIR= ${JAVASHAREDIR}/${PORTNAME} -SUB_FILES= ${PORTNAME} pkg-message -SUB_LIST= MAPYRUSJAR=${MAPYRUSJAR} -MAPYRUSJAR= ${PORTNAME}.jar MAPYRUSDOCS= ${PORTNAME}.pdf +MAPYRUSJAR= ${PORTNAME}.jar -FIND_DATA= -type f -not \( -iname "copying" -or -iname "*.tex" \) -FIND_HERE= userdoc +NO_BUILD= yes +NO_WRKSUBDIR= yes OPTIONS_DEFINE= DOCS EXAMPLES -.include +SUB_FILES= ${PORTNAME} pkg-message +SUB_LIST= MAPYRUSJAR=${MAPYRUSJAR} + +USES= zip +USE_JAVA= yes do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKDIR}/${MAPYRUSJAR} ${STAGEDIR}${DATADIR}/${MAPYRUSJAR} ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/${MAPYRUSDOCS} ${STAGEDIR}${DOCSDIR}/ + ${INSTALL_DATA} ${WRKDIR}/${MAPYRUSDOCS} ${STAGEDIR}${DOCSDIR}/${MAPYRUSDOCS} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - cd ${WRKDIR} && ${FIND} ${FIND_HERE} ${FIND_DATA} -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR} \; + cd ${WRKDIR}/userdoc && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} \ + "-type f -not -iname copying -and -not -iname *\.tex" .include Modified: head/graphics/mapyrus/distinfo ============================================================================== --- head/graphics/mapyrus/distinfo Mon Feb 2 22:56:02 2015 (r378336) +++ head/graphics/mapyrus/distinfo Mon Feb 2 22:56:46 2015 (r378337) @@ -1,2 +1,2 @@ -SHA256 (mapyrus-1.302.zip) = 51414f6a8e5696dfe347a220612306958d9ad2e9ca8d2b284d0b5dc56521c614 -SIZE (mapyrus-1.302.zip) = 5113116 +SHA256 (mapyrus-1.401.zip) = 2781f2e0d9dee943976ffb28ead144542368de81e72bc54e78445c8aad94f7d1 +SIZE (mapyrus-1.401.zip) = 5116813 Modified: head/graphics/mapyrus/files/mapyrus.in ============================================================================== --- head/graphics/mapyrus/files/mapyrus.in Mon Feb 2 22:56:02 2015 (r378336) +++ head/graphics/mapyrus/files/mapyrus.in Mon Feb 2 22:56:46 2015 (r378337) @@ -1,5 +1,4 @@ #!/bin/sh -# $FreeBSD$ if [ -z "${DISPLAY}" ]; then JAVA_AWT_HEADLESS="-Djava.awt.headless=true" else Modified: head/graphics/mapyrus/pkg-plist ============================================================================== --- head/graphics/mapyrus/pkg-plist Mon Feb 2 22:56:02 2015 (r378336) +++ head/graphics/mapyrus/pkg-plist Mon Feb 2 22:56:46 2015 (r378337) @@ -57,6 +57,7 @@ bin/mapyrus %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorialfirst4.mapyrus %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorialflowlabel1.mapyrus %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorialflowlabel2.mapyrus +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorialformatting1.mapyrus %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorialgeoimage1.mapyrus %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorialgeoimage2.mapyrus %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorialgeoimage3.mapyrus