Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22229/10.3/unstable/main/finkinfo/graphics
Modified Files:
xrmap.info xrmap.patch
Log Message:
New version that runs. Needs some work for gcc4.
Index: xrmap.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/xrmap.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xrmap.patch 18 Jan 2004 00:38:18 -0000 1.1
+++ xrmap.patch 22 Dec 2005 23:26:05 -0000 1.2
@@ -1,18 +1,163 @@
---- xrmap-2.29/editkit/Makefile.kit~ Fri May 16 11:07:14 2003
-+++ xrmap-2.29/editkit/Makefile.kit Sun Jun 29 13:45:57 2003
-@@ -14,8 +14,10 @@
+diff -Nurd -x'*~' xrmap-2.33.orig/EXTRADATA xrmap-2.33/EXTRADATA
+--- xrmap-2.33.orig/EXTRADATA 2005-11-05 08:31:57.000000000 -0500
++++ xrmap-2.33/EXTRADATA 2005-12-22 16:55:54.000000000 -0500
+@@ -3,13 +3,13 @@
+
+ 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/rmap) :
+
+ Required:
+- 6750214 CIA_WDB2.jpd.bz2 (CIA vector map data)
++ * 6750214 CIA_WDB2.jpd.bz2 (CIA vector map data)
+ 4006416 flags-2.5-eps.tar.bz2 (national flags, EPS format)
+ or
+- 1198980 flags-2.5-xpm_150.tar.bz2 (national flags, XPM format)
++ * 1198980 flags-2.5-xpm_150.tar.bz2 (national flags, XPM format)
+
+ Required only by earthview:
+ 8399634 earthdata_low_res.tar.bz2 (topography + population data)
+@@ -32,4 +32,6 @@
+
+ available from ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data
+
++ * CIA_WDB2.jpd and flags_150 are already installed by fink.
++
+ ******************************************************************************
+diff -Nurd -x'*~' xrmap-2.33.orig/Makefile.noimake xrmap-2.33/Makefile.noimake
+--- xrmap-2.33.orig/Makefile.noimake 2005-11-06 16:50:38.000000000 -0500
++++ xrmap-2.33/Makefile.noimake 2005-12-22 16:20:50.000000000 -0500
+@@ -1,28 +1,29 @@
+ DESTDIR=/usr
+-X11DIR=$(DESTDIR)/X11R6
++BINDIR=$(DESTDIR)/bin
+ SHAREDIR=$(DESTDIR)/share/rmap
+ 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)\" \
+ -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 -lXpm -lX11 -ljpeg -lz -lpng -lm -L/usr/X11R6/lib
$(LDFLAGS)
+ ## LDOPTIONS=-O6 -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 $(MAKEFLAGS)
++ cd earthview ; make $(MAKEFLAGS)
+ @cat EXTRADATA
+
+ numdefs.h:
+@@ -38,7 +39,8 @@
+ gcc $(CCOPTIONS) -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,20 +52,21 @@
+ 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 \
+ 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)
+- cp -f xrmap.man $(X11DIR)/man/man1/xrmap.1x
+- if [ -r $(X11DIR)/xrmap.1x.gz ] ; \
+- then gzip -f $(DESTDIR)$(MANDIR)/xrmap.1x ; fi
+- cd editkit ; make -f Makefile.kit install DESTDIR=$(DESTDIR)
+- cd earthview ; make install DESTDIR=$(DESTDIR)
++ mkdir -p $(MANDIR)
++ cp -f xrmap.man $(MANDIR)/xrmap.1x
++ if [ -r $(MANDIR)/xrmap.1x.gz ] ; \
++ then gzip -f $(MANDIR)/xrmap.1x ; fi
++ cd editkit ; make -f Makefile.kit install $(MAKEFLAGS)
++ cd earthview ; make install $(MAKEFLAGS)
+ @cat EXTRADATA
+
+ clean:
+diff -Nurd -x'*~' xrmap-2.33.orig/earthview/Makefile
xrmap-2.33/earthview/Makefile
+--- xrmap-2.33.orig/earthview/Makefile 2005-07-14 17:16:30.000000000 -0400
++++ xrmap-2.33/earthview/Makefile 2005-12-22 15:25:44.000000000 -0500
+@@ -2,8 +2,9 @@
+ DESTDIR=/usr
+ #fi
+
+-BINDIR=$(DESTDIR)/X11R6/bin
++BINDIR=$(DESTDIR)/bin
+ DATADIR=$(DESTDIR)/share/rmap/earthdata
++DOCDIR=$(DESTDIR)/share/rmap/doc
+
+ all: earthview
+
+@@ -11,13 +12,15 @@
+ gcc -Wall -DDATADIR=\"$(DATADIR)\" earthview.c -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
+diff -Nurd -x'*~' xrmap-2.33.orig/editkit/Makefile.kit
xrmap-2.33/editkit/Makefile.kit
+--- xrmap-2.33.orig/editkit/Makefile.kit 2005-09-28 03:52:13.000000000
-0400
++++ xrmap-2.33/editkit/Makefile.kit 2005-12-22 16:12:24.000000000 -0500
+@@ -13,15 +13,16 @@
+ # MINIMAL to remove bak files, /usr/share/edmtx and e**rc
# TLL for Terry Loveall personal settings
- SHARE_DIR=/usr/share/editkit
-+BINDIR=/usr/bin
-+XBINDIR=/usr/X11R6/bin
+-SHAREDIR=/usr/share/editkit
++SHAREDIR=$(DESTDIR)/share/editkit
++BINDIR=$(DESTDIR)/bin
--CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY
-DSHARE_DIR="\"$(SHARE_DIR)\""
-+CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DNOEDIT -DGREEK
-DJUSTIFY -DSHARE_DIR="\"$(SHARE_DIR)\"" $(EXTRA_CFLAGS)
+-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY
-DSHAREDIR="\"$(SHAREDIR)\""
++CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DNOEDIT -DGREEK
-DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" $(CPPFLAGS)
#CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DMINIMAL -DTWOBUTN -DVERTCURS
-DTLL
-@@ -47,32 +49,32 @@
+ #CFLAGS = -g -pipe
+
+-TLIBS = -L/usr/lib -ltermcap
++TLIBS = -lncurses $(LDFLAGS)
+ XLIBS = -L/usr/X11R6/lib -lX11
+
+ # Use this for solaris
+@@ -47,23 +48,23 @@
gcc $(CFLAGS) -o emx emx.o $(XLIBS)
@ls -al $@;strip $@;ls -al $@
@@ -37,73 +182,10 @@
- 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
-- mkdir -p $(SHARE_DIR)
-- cp -f rc.example $(SHARE_DIR)/rc.common
-- cp -f README $(SHARE_DIR)
-- if [ -x edt ] || [ -x edx ]; then cp -f MANUAL.wo*ar $(SHARE_DIR); fi
-- if [ -x emt ] || [ -x emx ]; then cp -f MANUAL.emacs $(SHARE_DIR); fi
-- if [ -x edt ]; then cd $(SHARE_DIR); ln -sf rc.common edtrc; fi
-- if [ -x emt ]; then cd $(SHARE_DIR); ln -sf rc.common emtrc; fi
-- if [ -x edx ]; then cd $(SHARE_DIR); ln -sf rc.common edxrc; fi
-- if [ -x emx ]; then cd $(SHARE_DIR); ln -sf rc.common emxrc; fi
-+ if [ -x edt ]; then cp -f edt $(DESTDIR)$(BINDIR); fi
-+ if [ -x emt ]; then cp -f emt $(DESTDIR)$(BINDIR); fi
-+ if [ -x edx ]; then cp -f edx $(DESTDIR)$(XBINDIR); fi
-+ if [ -x emx ]; then cp -f emx $(DESTDIR)$(XBINDIR); fi
-+ mkdir -p $(DESTDIR)$(SHARE_DIR)
-+ cp -f rc.example $(DESTDIR)$(SHARE_DIR)/rc.common
-+ cp -f README $(DESTDIR)$(SHARE_DIR)
-+ if [ -x edt ] || [ -x edx ]; then cp -f MANUAL.wo*ar
$(DESTDIR)$(SHARE_DIR); fi
-+ if [ -x emt ] || [ -x emx ]; then cp -f MANUAL.emacs
$(DESTDIR)$(SHARE_DIR); fi
-+ if [ -x edt ]; then cd $(DESTDIR)$(SHARE_DIR); ln -sf rc.common edtrc;
fi
-+ if [ -x emt ]; then cd $(DESTDIR)$(SHARE_DIR); ln -sf rc.common emtrc;
fi
-+ if [ -x edx ]; then cd $(DESTDIR)$(SHARE_DIR); ln -sf rc.common edxrc;
fi
-+ if [ -x emx ]; then cd $(DESTDIR)$(SHARE_DIR); ln -sf rc.common emxrc;
fi
-
- clean:
- -rm -f *.o *~ edt emt edx emx
---- /Users/ben/Downloads/xrmap-2.29/Makefile.noimake Sun May 18 12:34:36 2003
-+++ xrmap-2.29/Makefile.noimake Sun Jun 29 14:30:39 2003
-@@ -5,10 +5,11 @@
- HTML_VIEWER="dillo"
- PRINT_CMD="lpr -Plocal"
- EDITOR="emx"
--MIDIPLAYER="timidity -ig"
-+MIDIPLAYER="qtplay"
-+MANDIR=$(X11DIR)/man/man1
-
--CCOPTIONS=-O6 -g -Wall -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
-DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\"
-DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\"
-DEDITOR=\"$(EDITOR)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\"
--LDOPTIONS=-O6 -g -Wall -lXpm -lX11 -lz -lm -L/usr/X11R6/lib
-+CCOPTIONS=-O6 -g -Wall -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
-DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\"
-DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\"
-DEDITOR=\"$(EDITOR)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\"
-DMUSICPLAYER=\"$(MUSICPLAYER)\" $(EXTRA_CFLAGS)
-+LDOPTIONS=-O6 -g -Wall -lXpm -lX11 -lz -lm -L/usr/X11R6/lib $(LDFLAGS)
-
- all: explorer.o xrmap.o
- gcc $(LDOPTIONS) -o xrmap explorer.o xrmap.o
-@@ -24,9 +25,9 @@
- gcc $(CCOPTIONS) -c xrmap.c
-
- install:
-- install -c -s xrmap $(X11DIR)/bin
-- mkdir -p $(SHAREDIR)
-- cp -f Xrmaprc Locations $(SHAREDIR)
-+ install -c -s xrmap $(DESTDIR)$(X11DIR)/bin
-+ mkdir -p $(DESTDIR)$(SHAREDIR)
-+ cp -f Xrmaprc Locations $(DESTDIR)$(SHAREDIR)
- cd postscript ; rm -f *~
- cp -fR postscript $(DESTDIR)$(SHAREDIR)
- cd themes ; rm -f *~
-@@ -41,10 +42,11 @@
- EXAMPLE.rc midi_cfg/README.midi $(DESTDIR)$(SHAREDIR)/doc
- cd rc ; rm -f *~
- cp -fR rc $(DESTDIR)$(SHAREDIR)
-- cp -f xrmap.man $(X11DIR)/man/man1/xrmap.1x
-- if [ -r $(X11DIR)/xrmap.1x.gz ] ; \
-+ mkdir -p $(DESTDIR)$(MANDIR)
-+ cp -f xrmap.man $(DESTDIR)$(MANDIR)/xrmap.1x
-+ if [ -r $(DESTDIR)$(X11DIR)/xrmap.1x.gz ] ; \
- then gzip -f $(DESTDIR)$(MANDIR)/xrmap.1x ; fi
-- cd editkit ; make install
-+ cd editkit ; make -f Makefile.kit install
- cat WARNING
-
- clean:
++ 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)
Index: xrmap.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/xrmap.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xrmap.info 16 Aug 2004 02:09:01 -0000 1.2
+++ xrmap.info 22 Dec 2005 23:26:05 -0000 1.3
@@ -1,27 +1,40 @@
Package: xrmap
-Version: 2.29
-Revision: 11
+Version: 2.33
+Revision: 1
Source: ftp://ftp.ac-grenoble.fr/ge/geosciences/%n/%n-%v.tar.bz2
-Source-MD5: 8e0ef89c17aca958d855e8c75dff6ab0
-Source2: http://frmas.free.fr/files/CIA_WDB2.jpd.bz2
-Source2-MD5: 8239b0d93bfec8d46d337dad9896774a
-BuildDepends: x11-dev
-Depends: x11-shlibs
-Suggests: qtplay
+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, imagemagick, gcc3.3
+Depends: x11-shlibs, libjpeg-shlibs, libpng3-shlibs
+Suggests: qtplay, libjpeg, libpng3, inkscape, dillo, gv
Patch: %n.patch
+SetCPPFLAGS: -I/usr/X11R6/include
+SetCC: gcc-3.3
+PatchScript: <<
+ mv INSTALL installfoo
+ perl -pi.bak -e 's| INSTALL LI| installfoo LI|g' Makefile.noimake
+ perl -pi -e 's,/usr,%p,' EXTRADATA
+ perl -pi -e s'/(COLS|LINES)/local_\1/g' editkit/termcap.c
+ perl -pi -e 's/gcc/gcc-3.3/g' Makefile.noimake editkit/Makefile.kit
earthview/Makefile
+<<
CompileScript: <<
-mv INSTALL installfoo
-xmkmf
-bzip2 -d ../CIA_WDB2.jpd.bz2
-make -f Makefile.noimake SHARE_DIR=%p/share/editkit SHAREDIR=%p/share/xrmap
EXTRA_CFLAGS="-I/usr/X11R6/include -I%p/include"
+ xmkmf
+ make -f Makefile.noimake DESTDIR=%p
<<
InstallScript: <<
-mkdir -p %i/bin
-perl -pi.bak -e 's| INSTALL LI| installfoo LI|g' Makefile.noimake
-make -f Makefile.noimake install DESTDIR=%d X11DIR=%p SHAREDIR=%p/share/xrmap
SHARE_DIR=%p/share/editkit BINDIR=%p/bin XBINDIR=%p/bin MANDIR=%p/share/man/man1
-cp ../CIA_WDB2.jpd %i/share/xrmap
+ make -f Makefile.noimake install DESTDIR=%i
+
+ mkdir -p %i/share/%n
+ bzip2 -cd ../CIA_WDB2-20050830.jpd.bz2 > %i/share/rmap/CIA_WDB2.jpd
+ cp -r ../flags/* %i/share/rmap/flags
+
+ mkdir -p %i/share/doc
+ ln -s %p/share/rmap/doc %i/share/doc/%n
<<
-DocFiles: README LICENSE EXAMPLE.rc CHANGES TODO WARNING MAPEDIT
Description: World map data viewer and editor
DescDetail: <<
The Xrmap program provides a user-friendly X client for generating
@@ -32,7 +45,14 @@
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. See website for more data, flags,
anthems, etc.
+Package includes CIA Vector Data info and low-res flags.
+See website for more data, flags, anthems, etc.
+<<
+DescPort: <<
+ Ptch around symbol conflicts vs libncurses (why isn't termcap.c just
+ using them instead of re-implementing?)
+
+ xrmap.c has nested functions...need to fix this for gcc4
<<
License: GPL
Maintainer: Ben Hines <[EMAIL PROTECTED]>
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
