From owner-svn-ports-head@FreeBSD.ORG Sun Nov 10 19:48:23 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id F2221375; Sun, 10 Nov 2013 19:48:22 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DFADC2D86; Sun, 10 Nov 2013 19:48:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAAJmMrT010529; Sun, 10 Nov 2013 19:48:22 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAAJmMoF010527; Sun, 10 Nov 2013 19:48:22 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201311101948.rAAJmMoF010527@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sun, 10 Nov 2013 19:48:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333432 - head/graphics/openjump 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.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Nov 2013 19:48:23 -0000 Author: sunpoet Date: Sun Nov 10 19:48:22 2013 New Revision: 333432 URL: http://svnweb.freebsd.org/changeset/ports/333432 Log: - Remove leading indefinite article from COMMENT - Prettify Makefile output - Support STAGEDIR - Fix PLIST PR: ports/183840 Submitted by: Rainer Hurling (maintainer) Modified: head/graphics/openjump/Makefile head/graphics/openjump/pkg-plist Modified: head/graphics/openjump/Makefile ============================================================================== --- head/graphics/openjump/Makefile Sun Nov 10 19:48:17 2013 (r333431) +++ head/graphics/openjump/Makefile Sun Nov 10 19:48:22 2013 (r333432) @@ -8,7 +8,7 @@ MASTER_SITES= SF/jump-pilot/OpenJUMP/${P DISTNAME= ${PORTNAME}-Portable-${PORTVERSION}-r${PLUS_REV}-PLUS MAINTAINER= rhurlin@gwdg.de -COMMENT= An open source GIS software written in Java +COMMENT= Open source GIS software written in Java LICENSE= BSD CLEARTHOUGHT CPL ECW GPLv2 GPLv3 JAIDL JDOM JYTHON LGPL21 LGPL3 LICENSE_COMB= multi @@ -37,7 +37,7 @@ LICENSE_NAME_JYTHON= The Jython License LICENSE_FILE_JYTHON= ${WRKSRC}/licenses/jython_license.txt LICENSE_PERMS_JYTHON= auto-accept -TARGET_DIR= ${PREFIX}/${PORTNAME} +TARGET_DIR= ${STAGEDIR}${PREFIX}/${PORTNAME} USE_JAVA= yes JAVA_VERSION= 1.6+ USE_ZIP= yes @@ -46,17 +46,16 @@ NO_WRKSUBDIR= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-r${PLUS_REV}-PLUS PLUS_REV= 3576 -NO_STAGE= yes do-install: - @${ECHO_CMD} "---> Installing JAR files" + @${ECHO_CMD} "---> Installing JAR files" ${MKDIR} ${TARGET_DIR}/lib ${INSTALL_DATA} ${WRKSRC}/lib/*.jar ${TARGET_DIR}/lib ${MKDIR} ${TARGET_DIR}/lib/ext @cd ${WRKSRC}/lib/ext && ${COPYTREE_SHARE} . ${TARGET_DIR}/lib/ext - @${ECHO_MSG} "Installing startup script" + @${ECHO_MSG} "---> Installing startup script" ${MKDIR} ${TARGET_DIR}/bin ${INSTALL_SCRIPT} ${WRKSRC}/bin/oj_linux.sh ${TARGET_DIR}/bin/openjump - ${LN} -sf ${PREFIX}/${PORTNAME}/bin/openjump ${PREFIX}/bin/openjump + ${LN} -sf ../${PORTNAME}/bin/openjump ${STAGEDIR}${PREFIX}/bin/openjump ${INSTALL_DATA} ${WRKSRC}/bin/default-plugins.xml ${TARGET_DIR}/bin/ ${INSTALL_DATA} ${WRKSRC}/bin/log4j.xml ${TARGET_DIR}/bin/ @@ -64,12 +63,12 @@ do-install: post-install: .if ${PORT_OPTIONS:MDOCS} - @${ECHO_MSG} "---> Installing documentation" - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/Changes.txt ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR} + @${ECHO_MSG} "---> Installing documentation" + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/Changes.txt ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR} .else - @${ECHO_MSG} "---> Skipping documentation" + @${ECHO_MSG} "---> Skipping documentation" .endif .include Modified: head/graphics/openjump/pkg-plist ============================================================================== --- head/graphics/openjump/pkg-plist Sun Nov 10 19:48:17 2013 (r333431) +++ head/graphics/openjump/pkg-plist Sun Nov 10 19:48:22 2013 (r333432) @@ -1042,7 +1042,6 @@ bin/openjump @dirrm OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.fillSinks @dirrm OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.edgeContamination @dirrm OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.distToChannelNetwork -@dirrm OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.createHyetogram @dirrm OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.channelNetwork @dirrm OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.cellBalance @dirrm OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.cFactorFromNDVI