Attachment 66004 Details for Bug 97684 – openmap-4.6.2_1.patch

[patch] openmap-4.6.2_1.patch

openmap-4.6.2_1.patch (text/plain), 3.14 KB, created by Herve Quiroz on 2006-05-23 11:00:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Herve Quiroz

Created: 2006-05-23 11:00:36 UTC

Size: 3.14 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/astro/openmap/Makefile,v
>retrieving revision 1.2
>diff -u -u -r1.2 Makefile
>--- Makefile	3 May 2006 05:14:06 -0000	1.2
>+++ Makefile	23 May 2006 09:56:53 -0000
>@@ -7,35 +7,30 @@
> 
> PORTNAME=	openmap
> PORTVERSION=	4.6.2
>+PORTREVISION=	1
> CATEGORIES=	astro java devel graphics
> MASTER_SITES=	http://openmap.bbn.com/src/
> 
> MAINTAINER=	des@FreeBSD.org
> COMMENT=	Java toolkit for manipulating and displaying geographic data
> 
>-BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant
> RUN_DEPENDS=	classpath:${PORTSDIR}/java/javavmwrapper
> 
>-USE_JAVA=	1.4+
>+USE_JAVA=	yes
>+JAVA_VERSION=	1.4+
> 
> PKGMESSAGE=	${WRKSRC}/LICENSE
> 
>-ANT_PROPERTIES=	openmap.home=${WRKSRC} \
>-		idl2java.compiler=${JAVA_HOME}/bin/idlj
>-ANT_CMD=	${LOCALBASE}/bin/ant ${ANT_PROPERTIES:C/^/-D/}
>+USE_ANT=	yes
>+MAKE_ARGS+=	-Dopenmap.home=${WRKSRC} \
>+		-Didl2java.compiler=${JAVA_HOME}/bin/idlj
>+
>+SUB_FILES=	openmap.sh
> 
> do-configure:
> 	(cd ${WRKSRC} && ${FIND} . -type f -print0 | ${XARGS} -0 \
> 	    ${REINPLACE_CMD} -e 's,/usr/local/openmap,${DATADIR},g')
> 	(cd ${WRKSRC} && ${FIND} . -type f -name \*.bak -delete)
>-	${SED} \
>-	    -e 's,%%CLASSPATH%%,${LOCALBASE}/bin/classpath,' \
>-	    -e 's,%%JAVAVM%%,${LOCALBASE}/bin/java,' \
>-	    -e 's,%%DATADIR%%,${DATADIR},' \
>-	    <${FILESDIR}/openmap.sh >${WRKDIR}/openmap.sh
>-
>-do-build:
>-	(cd ${WRKSRC} && ${ANT_CMD})
> 
> do-install:
> 	(cd ${WRKSRC}/lib && \
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/astro/openmap/pkg-plist,v
>retrieving revision 1.1
>diff -u -u -r1.1 pkg-plist
>--- pkg-plist	30 Jul 2005 07:57:51 -0000	1.1
>+++ pkg-plist	23 May 2006 09:56:53 -0000
>@@ -2639,11 +2639,11 @@
> %%PORTDOCS%%%%DOCSDIR%%/user-guide-4.html
> %%PORTDOCS%%%%DOCSDIR%%/user-guide.html
> bin/openmap
>-share/java/classes/milStd2525_png.jar
>-share/java/classes/omcorba.jar
>-share/java/classes/omj3d.jar
>-share/java/classes/omsvg.jar
>-share/java/classes/openmap.jar
>+%%JAVAJARDIR%%/milStd2525_png.jar
>+%%JAVAJARDIR%%/omcorba.jar
>+%%JAVAJARDIR%%/omj3d.jar
>+%%JAVAJARDIR%%/omsvg.jar
>+%%JAVAJARDIR%%/openmap.jar
> @dirrm %%DATADIR%%/data/shape/cntry02
> @dirrm %%DATADIR%%/data/shape
> @dirrm %%DATADIR%%/data
>Index: files/openmap.sh
>===================================================================
>RCS file: files/openmap.sh
>diff -N files/openmap.sh
>--- files/openmap.sh	30 Jul 2005 07:57:51 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,9 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD: ports/astro/openmap/files/openmap.sh,v 1.1 2005/07/30 07:57:51 des Exp $
>-#
>-
>-cd %%DATADIR%%
>-exec %%JAVAVM%% \
>-    -classpath $(%%CLASSPATH%%) \
>-    com.bbn.openmap.app.OpenMap "%@"
>Index: files/openmap.sh.in
>===================================================================
>RCS file: files/openmap.sh.in
>diff -N files/openmap.sh.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/openmap.sh.in	23 May 2006 09:56:53 -0000
>@@ -0,0 +1,10 @@
>+#!/bin/sh
>+#
>+# $FreeBSD$
>+#
>+
>+cd "%%DATADIR%%"
>+JAVA_VERSION="%%JAVA_VERSION%%" \
>+    exec "%%LOCALBASE%%/bin/java" \
>+    -classpath $(%%LOCALBASE%%/bin/classpath) \
>+    com.bbn.openmap.app.OpenMap "%@"

Actions: View | Diff

Attachments on bug 97684: 66004