ports/183840: [maintainer][patch] graphics/openjump: support STAGEDIR

[Rainer Hurling]

>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 at 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 at 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 <bsd.port.mk>
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
- at 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: