Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 28 Oct 2005 19:10:09 -0400
From:      Serge Gagnon <serge.gagnon@b2b2c.ca>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/88160: [MAINTAINER FIX] misc/xrmap add missing extra-data
Message-ID:  <E1EVdMP-000L6C-RB@quenix1.dyndns.org>
Resent-Message-ID: <200510282320.j9SNKIko013496@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         88160
>Category:       ports
>Synopsis:       [MAINTAINER FIX] misc/xrmap add missing extra-data
>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:   Fri Oct 28 23:20:18 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Serge Gagnon
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
me
>Environment:
System: FreeBSD quenix1.dyndns.org 5.4-STABLE FreeBSD 5.4-STABLE #0: Sun Oct 16 19:51:37 EDT 2005 root@quenix1.dyndns.org:/usr/obj/usr/src/sys/OCEAN i386


>Description:
	Add missing extra-data that cause earthview(1) to crash if
	you hit the 'c' key.
	
	Bump PORTREVISION

>How-To-Repeat:
	start earthview(1) and press 'c'

>Fix:


--- patch-xrmap-2.32_2 begins here ---
diff -u misc/xrmap.orig/Makefile misc/xrmap/Makefile
--- misc/xrmap.orig/Makefile	Fri Oct 28 17:57:59 2005
+++ misc/xrmap/Makefile	Fri Oct 28 19:04:27 2005
@@ -7,11 +7,11 @@
 
 PORTNAME=	xrmap
 PORTVERSION=	2.32
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/:data \
 		ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/:src
-DISTFILES=	${SRCFILE}:src ${DATAFILES:S|$|:data|} ${CIAFILE}:data
+DISTFILES=	${SRCFILE}:src ${DATAFILES:S|$|:data|} ${CIAFILE}:data ${POPFILE}:data
 DIST_SUBDIR=	xrmap
 EXTRACT_ONLY=	${SRCFILE} ${DATAFILES}
 
@@ -25,6 +25,7 @@
 USE_REINPLACE=	yes
 
 CIAFILE=	CIA_WDB2.jpd.bz2
+POPFILE=	population.dat.bz2
 SRCFILE=	xrmap-${PORTVERSION}.tar.bz2
 DATAFILES=	anthems-1.1.tar.bz2 earthdata_med_res.tar.bz2 \
 		factbook_text_2005.tar.bz2 factbook_html_2005.tar.bz2 \
@@ -37,6 +38,9 @@
 
 post-extract:
 	@${BZIP2_CMD} -dc ${_DISTDIR}/${CIAFILE} >${WRKDIR}/CIA_WDB2.jpd
+	@${MKDIR} ${WRKDIR}/earthdata/population
+	@${BZIP2_CMD} -dc ${_DISTDIR}/${POPFILE} > \
+	${WRKDIR}/earthdata/population/population.dat
 	@${RM} -f ${WRKDIR}/flags/svg/=
 
 post-patch:
diff -u misc/xrmap.orig/distinfo misc/xrmap/distinfo
--- misc/xrmap.orig/distinfo	Fri Oct 28 17:57:59 2005
+++ misc/xrmap/distinfo	Fri Oct 28 18:30:11 2005
@@ -16,3 +16,5 @@
 SIZE (xrmap/pdfmaps-1.2.tar.bz2) = 46412445
 MD5 (xrmap/CIA_WDB2.jpd.bz2) = 8b5255a685bbb5eef2f86df182731a32
 SIZE (xrmap/CIA_WDB2.jpd.bz2) = 6750214
+MD5 (xrmap/population.dat.bz2) = 0fa2a9b9805f55aa021456bccd4f5281
+SIZE (xrmap/population.dat.bz2) = 823796
Common subdirectories: misc/xrmap.orig/files and misc/xrmap/files
diff -u misc/xrmap.orig/pkg-plist misc/xrmap/pkg-plist
--- misc/xrmap.orig/pkg-plist	Fri Oct 28 17:57:59 2005
+++ misc/xrmap/pkg-plist	Fri Oct 28 18:56:59 2005
@@ -201,6 +201,7 @@
 share/rmap/anthems/zm.ant
 share/rmap/anthems/zw.ant
 share/rmap/earthdata/population/population.cps
+share/rmap/earthdata/population/population.dat
 share/rmap/earthdata/topography/10800x5400-15x15.az2
 share/rmap/earthdata/topography/topography.cps
 share/rmap/factbook/Factbook.css
--- patch-xrmap-2.32_2 ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1EVdMP-000L6C-RB>