Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory vz-cvs-3.sog:/tmp/cvs-serv15534
Added Files:
xrmap.info xrmap.patch
Log Message:
xrmap 2.33 to 10.7 by syncing with 10.5/6 update from tracker
https://sourceforge.net/tracker/?func=detail&aid=3497174&group_id=17203&atid=414256
--- NEW FILE: xrmap.patch ---
--- xrmap-2.33/EXTRADATA.orig 2005-11-05 14:31:57.000000000 +0100
+++ xrmap-2.33/EXTRADATA 2012-03-05 18:10:38.000000000 +0100
@@ -3,33 +3,35 @@
In addition to compiling and installing source files, xrmap requires
DATA FILES. You should download them SEPARATELY, and uncompress them
-in SHAREDIR (/usr/share/rmap by default) :
+in SHAREDIR (/usr/share/xrmap by default) :
Required:
- 6750214 CIA_WDB2.jpd.bz2 (CIA vector map data)
- 4006416 flags-2.5-eps.tar.bz2 (national flags, EPS format)
+ * 6750214 CIA_WDB2.jpd.bz2 (CIA vector map data)
+ 4910461 flags-2.7-eps.tar.bz2 (323 national flags, EPS format)
or
- 1198980 flags-2.5-xpm_150.tar.bz2 (national flags, XPM format)
+ * 1198980 flags-2.7-xpm_150.tar.bz2 (323 national flags, XPM format)
Required only by earthview:
8399634 earthdata_low_res.tar.bz2 (topography + population data)
Recommended:
- 95748 anthems-1.1.tar.bz2 (national anthems)
- 612060 hymns-1.2.tar.bz2 (national hymns in MIDI format)
- 699410 factbook_text_2005.tar.bz2 (CIA factbook, ASCII format)
+ 204506 anthems-1.3.tar.bz2 (270 national anthems)
+ 841330 hymns-1.4.tar.bz2 (270 national hymns in MIDI format)
+ 859837 factbook_text_2008.tar.bz2 (CIA factbook, ASCII format)
50589431 earthdata_med_res.tar.bz2 (required only by earthview)
Optional:
- 27193880 factbook_html_2005.tar.bz2 (CIA factbook, HTML format + maps)
- 46412445 pdfmaps-1.2.tar.bz2 (PDF maps from United Nations)
+ 42761187 factbook_html_2008.tar.bz2 (CIA factbook, HTML format + maps)
+ 48457671 pdfmaps-1.3.tar.bz2 (PDF maps from United Nations)
29194589 eawpats12.tar.bz2 (GUS samples for the MIDI player)
- 4062495 flags-2.5-svg.tar.bz2 (national flags, SVG format)
+ 5271488 flags-2.9-svg.tar.bz2 (324 national flags, SVG format)
488145582 earthdata_high_res.tar.bz2 (required only by earthview)
Source files (not needed to run xrmap) :
- 7084612 flags-2.5-src.tar.bz2 (national flags, SVG full collection)
+ 8869285 flags-2.9-src.tar.bz2 (550 flags, SVG full collection)
available from ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data
+ * CIA_WDB2.jpd and flags_150 are already installed by fink.
+
******************************************************************************
--- xrmap-2.33/Makefile.noimake.orig 2005-11-06 22:50:38.000000000 +0100
+++ xrmap-2.33/Makefile.noimake 2012-03-05 19:06:29.000000000 +0100
@@ -1,28 +1,29 @@
DESTDIR=/usr
-X11DIR=$(DESTDIR)/X11R6
-SHAREDIR=$(DESTDIR)/share/rmap
+BINDIR=$(DESTDIR)/bin
+SHAREDIR=$(DESTDIR)/share/xrmap
PS_VIEWER="gv -noantialias"
IM_VIEWER="display -background gray84"
HTML_VIEWER="dillo"
PRINT_CMD="lpr -Plocal"
EDITOR="emx"
-MIDIPLAYER="timidity -ig"
+MIDIPLAYER="qtplay"
SVG_VIEWER="inkscape"
SVG_CONVERT="inkscape %s --export-height=%d --export-png=%s"
+MANDIR=$(DESTDIR)/share/man/man1
-CCOPTIONS=-O6 -g -Wall -DZLIB -DXPMBUG -DSHAREDIR=\"$(SHAREDIR)\" \
+CCOPTIONS=-Os -g -Wall -DZLIB -DXPMBUG -DSHAREDIR=\"$(SHAREDIR)\" \
-DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" \
-DSVG_VIEWER=\"$(SVG_VIEWER)\" -DSVG_CONVERT=\"$(SVG_CONVERT)\" \
-DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" \
- -DEDITOR=\"$(EDITOR)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\"
+ -DEDITOR=\"$(EDITOR)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\" $(CPPFLAGS)
-LDOPTIONS=-O6 -g -Wall -lXpm -lX11 -ljpeg -lz -lpng -lm -L/usr/X11R6/lib
-## LDOPTIONS=-O6 -g -Wall libxpm/libXpm.a -lX11 -lz -lm -L/usr/X11R6/lib
+LDOPTIONS=-Os -g -Wall -lXpm -lX11 -ljpeg -lz -lpng -lm -L$(DESTDIR)/lib
-L/usr/X11R6/lib $(LDFLAGS)
+## LDOPTIONS=-Os -g -Wall libxpm/libXpm.a -lX11 -lz -lm -L/usr/X11R6/lib
all: explorer.o image.o xrmap.o
gcc $(LDOPTIONS) -o xrmap explorer.o image.o xrmap.o
- cd editkit ; make -f Makefile.kit DESTDIR=$(DESTDIR)
- cd earthview ; make DESTDIR=$(DESTDIR)
+ cd editkit ; make -f Makefile.kit edx emx $(MAKEFLAGS)
+ cd earthview ; make $(MAKEFLAGS)
@cat EXTRADATA
numdefs.h:
@@ -35,10 +36,11 @@
gcc $(CCOPTIONS) -c image.c
xrmap.o: xrmap.h version.h bitmaps.h numdefs.h menudefs.h xrmap.c
- gcc $(CCOPTIONS) -c xrmap.c
+ gcc $(CCOPTIONS) -trigraphs -c xrmap.c
install:
- install -c -s xrmap $(X11DIR)/bin
+ mkdir -p $(BINDIR)
+ install -c -s xrmap $(BINDIR)
mkdir -p $(SHAREDIR)
cp -f Xrmaprc Locations $(SHAREDIR)
cd postscript ; rm -f *~
@@ -50,15 +52,16 @@
if [ -d i18n ] ; then cd i18n ; rm -f *~ ; fi
if [ -d i18n ] ; then cp -fR i18n $(SHAREDIR) ; fi
if [ -d flags ] ; then cd flags ; rm -f *~ ; fi
- if [ -d flags ] ; then cp -fR flags $(DESTDIR)$(SHAREDIR) ; fi
+ if [ -d flags ] ; then cp -fR flags $(SHAREDIR) ; fi
if [ -d picons ] ; then cp -fR picons $(SHAREDIR) ; fi
mkdir -p $(SHAREDIR)/doc
- cp -f CHANGES INSTALL LICENSE MAPEDIT README TODO VECTORMAP EXTRADATA \
+ cp -f CHANGES INSTALL.txt LICENSE MAPEDIT README TODO VECTORMAP
EXTRADATA \
rc/00_example.rc midi_cfg/README.midi $(SHAREDIR)/doc
cp -f README $(SHAREDIR)/doc/README.xrmap
- cp -f earthview/README $(DESTDIR)$(SHAREDIR)/doc/README.earthview
+ cp -f earthview/README $(SHAREDIR)/doc/README.earthview
cd rc ; rm -f *~
cp -fR rc $(SHAREDIR)
+ mkdir -p $(X11DIR)/man/man1
cp -f xrmap.man $(X11DIR)/man/man1/xrmap.1x
if [ -r $(X11DIR)/xrmap.1x.gz ] ; \
then gzip -f $(DESTDIR)$(MANDIR)/xrmap.1x ; fi
--- xrmap-2.33/image.c-orig 2005-11-06 18:36:13.000000000 +0100
+++ xrmap-2.33/image.c 2012-03-05 18:16:22.000000000 +0100
@@ -18,6 +18,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <zlib.h>
#include <png.h>
#include <jpeglib.h>
--- xrmap-2.33/xrmap.c.orig 2005-11-06 22:59:40.000000000 +0100
+++ xrmap-2.33/xrmap.c 2012-03-05 18:58:33.000000000 +0100
@@ -5742,21 +5742,21 @@
return 1;
}
-void arcinfo_lines(ImageLayout *scene) {
- void *fd;
- char buf[512];
- char sep;
- char *ptr;
- char **seg;
- double a, b, c, d;
- int i, j, k, u, n, p, i0;
- int new_arc=0, ind, indpr, num_mod = -1, nstrokes, xi, yi;
- SpherePt sp;
- ScreenPt pt1, pt2;
- Pixel pix;
- double cotan_lat0, conv_lat0;
+/* fink patches here to un-nest next_segment from arcinfo_lines */
+ static void *fd;
+ static char buf[512];
+ static char sep;
+ static char *ptr;
+ static char **seg;
+ static double a, b, c, d;
+ static int i, j, k, u, n, p, i0;
+ static int new_arc=0, ind, indpr, num_mod = -1, nstrokes, xi, yi;
+ static SpherePt sp;
+ static ScreenPt pt1, pt2;
+ static Pixel pix;
+ static double cotan_lat0, conv_lat0;
-void next_segment(double x, double y)
+void next_segment(double x, double y, ImageLayout *scene)
{
double u, v, w, t;
int i, j, dx, dy, dxp, dyp, epsx, epsy;
@@ -5849,6 +5849,10 @@
}
}
+void arcinfo_lines(ImageLayout *scene)
+{
+ new_arc=0;
+
if (!arc_file) return;
i0 = -1;
@@ -5972,14 +5976,14 @@
ptr[28] = '\0';
n = sscanf(ptr, "%lg %lg", &a, &b);
if (n<2) continue;
- next_segment(a, b);
+ next_segment(a, b, &scene);
ptr[28] = sep;
p = sscanf(ptr+28, "%lg %lg", &c, &d);
- if (p>=2) next_segment(c, d);
+ if (p>=2) next_segment(c, d, &scene);
} else {
n = sscanf(ptr, "%lg %lg", &a, &b);
if (n<2) continue;
- next_segment(a, b);
+ next_segment(a, b, &scene);
}
}
#ifdef ZLIB
--- xrmap-2.33/earthview/Makefile.orig 2005-07-14 23:16:30.000000000 +0200
+++ xrmap-2.33/earthview/Makefile 2012-03-05 18:10:39.000000000 +0100
@@ -2,22 +2,27 @@
DESTDIR=/usr
#fi
-BINDIR=$(DESTDIR)/X11R6/bin
-DATADIR=$(DESTDIR)/share/rmap/earthdata
+BINDIR=$(DESTDIR)/bin
+DATADIR=$(DESTDIR)/share/xrmap/earthdata
+DOCDIR=$(DESTDIR)/share/xrmap/doc
all: earthview
-earthview: earthview.c
- gcc -Wall -DDATADIR=\"$(DATADIR)\" earthview.c -o earthview
-L/usr/X11R6/lib -lX11 -lm -lz -lbz2
+CPPFLAGS+= -DDATADIR=\"$(DATADIR)\"
+earthview: earthview.o
+ gcc -Wall earthview.o -o earthview -L/usr/X11R6/lib -lX11 -lm -lz -lbz2
+
install:
+ mkdir -p $(BINDIR)
install -c -s earthview $(BINDIR)
mkdir -p $(DATADIR)
mkdir -p $(DATADIR)/topography
cp -f data/topography.cps $(DATADIR)/topography
mkdir -p $(DATADIR)/population
cp -f data/population.cps $(DATADIR)/population
- cp -f README $(DESTDIR)/share/rmap/doc/README.earthview
+ mkdir -p $(DOCDIR)
+ cp -f README $(DOCDIR)/README.earthview
help: earthview
./earthview -help
--- xrmap-2.33/editkit/Makefile.kit.orig 2005-09-28 09:52:13.000000000
+0200
+++ xrmap-2.33/editkit/Makefile.kit 2012-03-05 18:18:06.000000000 +0100
@@ -13,19 +13,20 @@
# MINIMAL to remove bak files, /usr/share/edmtx and e**rc
# TLL for Terry Loveall personal settings
-SHAREDIR=/usr/share/editkit
+SHAREDIR=$(DESTDIR)/share/xrmap/editkit
+BINDIR=$(DESTDIR)/bin
-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY
-DSHAREDIR="\"$(SHAREDIR)\""
+CFLAGS = -Os -fomit-frame-pointer -pipe -Wall -DTHREED -DNOEDIT -DGREEK
-DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" $(CPPFLAGS)
-#CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DMINIMAL -DTWOBUTN -DVERTCURS
-DTLL
+#CFLAGS = -Os -fomit-frame-pointer -pipe -Wall -DMINIMAL -DTWOBUTN -DVERTCURS
-DTLL
#CFLAGS = -g -pipe
-TLIBS = -L/usr/lib -ltermcap
+TLIBS = -lncurses $(LDFLAGS)
XLIBS = -L/usr/X11R6/lib -lX11
# Use this for solaris
-#CFLAGS = -O2 -pipe -Wall
+#CFLAGS = -Os -pipe -Wall
#LIBS = -L/usr/openwin/lib -lsocket -lnsl -lresolv -lXext -lX11
@@ -47,23 +48,23 @@
gcc $(CFLAGS) -o emx emx.o $(XLIBS)
@ls -al $@;strip $@;ls -al $@
-edt.o: Makefile version.h messages.def termcap.c edit.h edit.c term_bind_ws.c
+edt.o: Makefile.kit version.h messages.def termcap.c edit.h edit.c
term_bind_ws.c
gcc $(CFLAGS) -DWORDSTAR -o edt.o -c termcap.c
-emt.o: Makefile version.h messages.def termcap.c edit.h edit.c term_bind_em.c
+emt.o: Makefile.kit version.h messages.def termcap.c edit.h edit.c
term_bind_em.c
gcc $(CFLAGS) -DEMACS -o emt.o -c termcap.c
-edx.o: Makefile version.h messages.def x11.c edit.h edit.c x11_bind_ws.c
+edx.o: Makefile.kit version.h messages.def x11.c edit.h edit.c x11_bind_ws.c
gcc $(CFLAGS) -DWORDSTAR -o edx.o -c x11.c
-emx.o: Makefile version.h messages.def x11.c edit.h edit.c x11_bind_em.c
+emx.o: Makefile.kit version.h messages.def x11.c edit.h edit.c x11_bind_em.c
gcc $(CFLAGS) -DEMACS -o emx.o -c x11.c
install:
- if [ -x edt ]; then cp -f edt /usr/bin; fi
- if [ -x emt ]; then cp -f emt /usr/bin; fi
- if [ -x edx ]; then cp -f edx /usr/X11R6/bin; fi
- if [ -x emx ]; then cp -f emx /usr/X11R6/bin; fi
+ if [ -x edt ]; then cp -f edt $(BINDIR); fi
+ if [ -x emt ]; then cp -f emt $(BINDIR); fi
+ if [ -x edx ]; then cp -f edx $(BINDIR); fi
+ if [ -x emx ]; then cp -f emx $(BINDIR); fi
mkdir -p $(SHAREDIR)
cp -f rc.example $(SHAREDIR)/rc.common
cp -f README $(SHAREDIR)
--- NEW FILE: xrmap.info ---
Package: xrmap
Version: 2.33
Revision: 9
Source: ftp://ftp.ac-grenoble.fr/ge/geosciences/%n/%n-%v.tar.bz2
Source-MD5: c743f0c90699227d5bdba4984e3edf77
Source2: ftp://ftp.ac-grenoble.fr/ge/geosciences/%n/data/CIA_WDB2.jpd.bz2
Source2Rename: CIA_WDB2-20050830.jpd.bz2
Source2-MD5: 8b5255a685bbb5eef2f86df182731a32
Source3:
ftp://ftp.ac-grenoble.fr/ge/geosciences/%n/data/flags-2.7-xpm_150.tar.bz2
Source3-MD5: d28ad6d057e824f80673de27d0c94c16
BuildDepends: x11-dev, libjpeg8, libpng15, xmkmf (>= 1.0.2-3)
Depends: x11-shlibs, libjpeg8-shlibs, libpng15-shlibs
Suggests: qtplay, libjpeg8, libpng15, inkscape, imagemagick, dillo, gv
PatchFile: %n.patch
PatchFile-MD5: 554fab5f58691a83627d6e363d615922
UseMaxBuildJobs: False
PatchScript: <<
%{default_script}
mv INSTALL INSTALL.txt
perl -pi -e s',/usr,%p,' EXTRADATA
perl -pi -e s',(COLS|LINES),local_\1,g' editkit/termcap.c
chmod 644 i18n/xrmap_msg.de
rm -fv editkit/e[dm][tx]
if [ `sw_vers -productVersion | cut -f2 -d.` == 5 ]; then \
perl -pi.bak -e 's,gcc ,gcc-4.2 ,g' Makefile.noimake ;\
perl -pi -e 's,cd earthview ; make,cd earthview ; make CC=gcc-4.2,g'
Makefile.noimake ;\
perl -pi.bak -e 's,cc ,gcc-4.2 ,g' tools/Makefile ;\
perl -pi.bak -e 's,gcc ,gcc-4.2 ,g' earthview/Makefile ;\
perl -pi.bak -e 's,gcc ,gcc-4.2 ,g' editkit/Makefile.kit ;\
perl -pi.bak -e 's,gcc ,gcc-4.2 ,g' tools/cbd2else/Makefile ;\
perl -pi.bak -e 's,gcc ,gcc-4.2 ,g' tools/jpd2else/Makefile ;\
perl -pi.bak -e 's,gcc ,gcc-4.2 ,g' tools/locutils/Makefile ;\
perl -pi.bak -e 's,gcc ,gcc-4.2 ,g' tools/rez2else/Makefile ;\
fi
<<
CompileScript: <<
#!/bin/sh -ev
export PATH=%p/lib/xmkmf/bin:$PATH
export IMAKEINCLUDE=-I%p/lib/X11/config
xmkmf
make -f Makefile.noimake DESTDIR=%p
<<
InstallScript: <<
#!/bin/sh -ev
export PATH=%p/lib/xmkmf/bin:$PATH
export IMAKEINCLUDE=-I%p/lib/X11/config
make -f Makefile.noimake install DESTDIR=%i X11DIR=%i/share
mv %i/share/%n/doc/INSTALL.txt %i/share/%n/doc/INSTALL
bzip2 -cd ../CIA_WDB2-20050830.jpd.bz2 > %i/share/%n/CIA_WDB2.jpd
cp -r ../flags/* %i/share/%n/flags
mkdir -p %i/share/doc
ln -s %p/share/xrmap/doc %i/share/doc/%n
<<
Description: World map data viewer and editor
DescDetail: <<
The Xrmap program provides a user-friendly X client for generating
images of the Earth and manipulating the CIA World data bank II global
vector information (a huge geodata set of about 45 MB). Available
features include coastlines and islands, political boundaries, major and
minor rivers, glaciers, lakes, canals, reefs, etc. The images can be
accurately zoomed in, up to a factor of 100 or more. The package also
contains a rather comprehensive data set of world cities and locations -
about 20000 cities are listed.
Package includes CIA Vector Data info and low-res flags.
See website for more data, flags, anthems, etc.
<<
DescPort: <<
Patch around symbol conflicts vs libncurses (why isn't termcap.c just
using them instead of re-implementing?)
Major patch of xrmap.c to un-nest some functions. Thanks msachs for
validating this approach for gcc4.
Original INSTALL file renamed temporarily to not confuse make on
case-insensitive HFS.
Only the X clients of the minimalistic editors are built (edx, emx).
All Xrmap related files are now installed in %p/share/xrmap instead
of %p/share/xrmap, including the editkit or earthview related files.
Using GCC 4.2 on Leopard, using non-parallel build because numdefs.h
is created by a small xrmap utility, preproc, that needs to be
compiled before; non-parallel build avoids a race condition.
<<
License: GPL
Maintainer: Peter Dyballa <peter_dyba...@freenet.de>
Homepage: http://frmas.free.fr/li_1.htm
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
