From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Nov 10 11:00:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 ESMTP id 389773DA for ; Sun, 10 Nov 2013 11:00:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 12D192391 for ; Sun, 10 Nov 2013 11:00:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rAAB01Me015408 for ; Sun, 10 Nov 2013 11:00:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rAAB01LK015407; Sun, 10 Nov 2013 11:00:01 GMT (envelope-from gnats) Resent-Date: Sun, 10 Nov 2013 11:00:01 GMT Resent-Message-Id: <201311101100.rAAB01LK015407@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rainer Hurling 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 A0E3E2CB for ; Sun, 10 Nov 2013 10:56:07 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8F0262375 for ; Sun, 10 Nov 2013 10:56:07 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id rAAAu7U5036696 for ; Sun, 10 Nov 2013 10:56:07 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id rAAAu6Qq036610; Sun, 10 Nov 2013 10:56:06 GMT (envelope-from nobody) Message-Id: <201311101056.rAAAu6Qq036610@oldred.freebsd.org> Date: Sun, 10 Nov 2013 10:56:06 GMT From: Rainer Hurling To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/183840: [maintainer][patch] graphics/openjump: support STAGEDIR X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Nov 2013 11:00:02 -0000 >Number: 183840 >Category: ports >Synopsis: [maintainer][patch] graphics/openjump: support STAGEDIR >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Nov 10 11:00:01 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Rainer Hurling >Release: 11.0-CURRENT (amd64) >Organization: >Environment: FreeBSD xxx.xxx.xxx 11.0-CURRENT FreeBSD 11.0-CURRENT #0 r257710: Tue Nov 5 19:07:14 CET 2013 xxx@xxx.xxx.xxx:/usr/obj/usr/src/sys/XXX amd64 >Description: - support STAGEDIR - correct pkg-plist - prettify Makefiles output a bit - remove leading indefinite article from COMMENT >How-To-Repeat: >Fix: Patch attached with submission follows: diff -u openjump.orig/Makefile openjump/Makefile --- openjump.orig/Makefile 2013-10-04 07:58:14.000000000 +0200 +++ openjump/Makefile 2013-11-10 11:43:29.000000000 +0100 @@ -8,7 +8,7 @@ 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_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 @@ 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 ${STAGEDIR}${PREFIX}/${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 @@ 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 Common subdirectories: openjump.orig/files and openjump/files diff -u openjump.orig/pkg-plist openjump/pkg-plist --- openjump.orig/pkg-plist 2013-07-02 20:41:55.000000000 +0200 +++ openjump/pkg-plist 2013-11-10 11:34:00.000000000 +0100 @@ -1042,7 +1042,6 @@ @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 >Release-Note: >Audit-Trail: >Unformatted: