From owner-svn-ports-all@FreeBSD.ORG Sun Mar 30 15:43:50 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 07A492A3; Sun, 30 Mar 2014 15:43:50 +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 DA032BFA; Sun, 30 Mar 2014 15:43:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2UFhnvQ044543; Sun, 30 Mar 2014 15:43:49 GMT (envelope-from nivit@svn.freebsd.org) Received: (from nivit@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2UFhnii044541; Sun, 30 Mar 2014 15:43:49 GMT (envelope-from nivit@svn.freebsd.org) Message-Id: <201403301543.s2UFhnii044541@svn.freebsd.org> From: Nicola Vitale Date: Sun, 30 Mar 2014 15:43:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349638 - 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.17 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: Sun, 30 Mar 2014 15:43:50 -0000 Author: nivit Date: Sun Mar 30 15:43:49 2014 New Revision: 349638 URL: http://svnweb.freebsd.org/changeset/ports/349638 QAT: https://qat.redports.org/buildarchive/r349638/ Log: - Fix a typo in mapyrus script, that prevented the program to start (bump PORTREVISION) - Remove leading article from COMMENT - Add support for stage dir Modified: head/graphics/mapyrus/Makefile head/graphics/mapyrus/files/mapyrus.in Modified: head/graphics/mapyrus/Makefile ============================================================================== --- head/graphics/mapyrus/Makefile Sun Mar 30 15:28:37 2014 (r349637) +++ head/graphics/mapyrus/Makefile Sun Mar 30 15:43:49 2014 (r349638) @@ -1,14 +1,14 @@ -# Created by: Nicola Vitale +# Created by: Nicola Vitale # $FreeBSD$ PORTNAME= mapyrus PORTVERSION= 1.302 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics print java MASTER_SITES= SF MAINTAINER= nivit@FreeBSD.org -COMMENT= A software for creating plots of points, lines, etc +COMMENT= Software for creating plots of points, lines, etc LICENSE= LGPL21 @@ -21,8 +21,7 @@ USES= zip DATADIR= ${JAVASHAREDIR}/${PORTNAME} SUB_FILES= ${PORTNAME} pkg-message -SUB_LIST= JAVA_VERSION=${JAVA_VERSION} \ - MAPYRUSJAR=${MAPYRUSJAR} +SUB_LIST= MAPYRUSJAR=${MAPYRUSJAR} MAPYRUSJAR= ${PORTNAME}.jar MAPYRUSDOCS= ${PORTNAME}.pdf @@ -32,23 +31,15 @@ FIND_HERE= userdoc OPTIONS_DEFINE= DOCS EXAMPLES -NO_STAGE= yes .include do-install: - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/${MAPYRUSJAR} ${DATADIR}/${MAPYRUSJAR} - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME} -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/${MAPYRUSDOCS} ${DOCSDIR}/ -.endif -.if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${EXAMPLESDIR} - cd ${WRKDIR} && ${FIND} ${FIND_HERE} ${FIND_DATA} -exec ${INSTALL_DATA} {} ${EXAMPLESDIR} \; -.endif - -post-install: - @${CAT} ${PKGMESSAGE} + @${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}/ + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKDIR} && ${FIND} ${FIND_HERE} ${FIND_DATA} -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR} \; .include Modified: head/graphics/mapyrus/files/mapyrus.in ============================================================================== --- head/graphics/mapyrus/files/mapyrus.in Sun Mar 30 15:28:37 2014 (r349637) +++ head/graphics/mapyrus/files/mapyrus.in Sun Mar 30 15:43:49 2014 (r349638) @@ -10,5 +10,5 @@ if [ -z "$1" ]; then else MAPYRUS_ARGS="$@" fi -JAVA_VERSION="%%JAVAVERSION%%" \ +JAVA_VERSION="%%JAVA_VERSION%%" \ exec "%%LOCALBASE%%/bin/java" ${JAVA_AWT_HEADLESS} -jar "%%DATADIR%%/mapyrus.jar" ${MAPYRUS_ARGS}