ports/52070: Update port: misc/xrmap to 2.28
Serge Gagnon
gagnon__s at videotron.ca
Sun May 11 10:00:31 UTC 2003
>Number: 52070
>Category: ports
>Synopsis: Update port: misc/xrmap to 2.28
>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 May 11 03:00:29 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Serge Gagnon
>Release: FreeBSD 4.8-STABLE i386
>Organization:
me
>Environment:
System: FreeBSD quenix.dyndns.org 4.8-STABLE FreeBSD 4.8-STABLE #0: Tue May 6 22:02:29 EDT 2003 serge at quenix.dyndns.org:/usr/obj/usr/src/sys/OCEAN3 i386
>Description:
o Update xrmap to 2.28
o Replace the file "files/patch-Imakfile" with this one in this PR
CHANGES according to the author are:
* Version 2.28, May 10, 2003
- Implemented -arc option (procedures for dealing with ARCINFO data format,
sort of... : check 'ARCINFO' documentation).
- Implemented -dump option (dump vector map data into some file, either in
ASCII or JPD format). The ASCII output can be edited by hand, and then
fed back to xrmap to produce modified vector map data.
- As a result of the above, it became possible/easy to modify the
original CIA Word Data Bank 2 to include new international border lines
appeared after 1990. Users *should* either download the new version,
or upgrade their old JPD vector map data as explained in VECTORMAP,
or use the tools/upgrade/upgrade_WDB2 script.
- Replaced German messages with an improved version contributed by
Peter Dyballa <Peter.Dyballa at Nols.de>
>How-To-Repeat:
>Fix:
--- patch-xrmap begins here ---
diff -u /usr/ports/misc/xrmap/Makefile ./Makefile
--- /usr/ports/misc/xrmap/Makefile Sat May 10 01:34:17 2003
+++ ./Makefile Sun May 11 05:57:44 2003
@@ -6,11 +6,10 @@
#
PORTNAME= xrmap
-PORTVERSION= 2.27
+PORTVERSION= 2.28
CATEGORIES= misc
-MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/ \
- ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/ \
- http://frmas.free.fr/files/
+MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/ \
+ ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/
DISTFILES= ${XRMAPFILE} ${DISTFILE} \
pdfmaps-1.1.tar.gz ${CIAFILE}
EXTRACT_ONLY= ${XRMAPFILE}
@@ -25,8 +24,8 @@
MAN1= xrmap.1
-CIAFILE= CIA_WDB2.jpd.bz2
-XRMAPFILE= xrmap-2.27.tar.bz2
+CIAFILE= CIA_WDB2.jpd.gz
+XRMAPFILE= xrmap-2.28.tar.bz2
DISTFILE= anthems-1.1.tar.bz2 \
factbook_text_2002.tar.bz2 factbook_html_2002.tar.bz2 \
flags-1.1.tar.bz2 hymns-1.2.tar.bz2
@@ -36,8 +35,7 @@
${TAR} -jxf ${DISTDIR}/$${f} -C ${WRKSRC}; \
done
${TAR} -zxf ${DISTDIR}/pdfmaps-1.1.tar.gz -C ${WRKSRC}
- ${BZIP2_CMD} -dk ${DISTDIR}/${CIAFILE}
- ${MV} ${DISTDIR}/CIA_WDB2.jpd ${WRKSRC}/
+ ${GUNZIP_CMD} -c ${DISTDIR}/${CIAFILE} >${WRKSRC}/CIA_WDB2.jpd
post-configure:
${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/Makefile
diff -u /usr/ports/misc/xrmap/distinfo ./distinfo
--- /usr/ports/misc/xrmap/distinfo Sat May 10 01:34:17 2003
+++ ./distinfo Sun May 11 05:47:54 2003
@@ -1,5 +1,5 @@
-MD5 (xrmap-2.27.tar.bz2) = 11a47b0e2c8fdab904759a54684dcb50
-MD5 (CIA_WDB2.jpd.bz2) = 8239b0d93bfec8d46d337dad9896774a
+MD5 (xrmap-2.28.tar.bz2) = c2f5f9e7624745337a9a4bd21ec90425
+MD5 (CIA_WDB2.jpd.gz) = 01f4fcefd5015cd276c2f5952de4f22a
MD5 (anthems-1.1.tar.bz2) = 4d63e6a61e9197f3c382e518de6503db
MD5 (factbook_html_2002.tar.bz2) = 7909b52825123c677369eb723e5b267f
MD5 (factbook_text_2002.tar.bz2) = d28fc69a9fd48d9d39a1fda8099cfb1b
Common subdirectories: /usr/ports/misc/xrmap/files and ./files
diff -u /usr/ports/misc/xrmap/pkg-plist ./pkg-plist
--- /usr/ports/misc/xrmap/pkg-plist Sat May 10 01:34:17 2003
+++ ./pkg-plist Sat May 10 22:01:57 2003
@@ -212,6 +212,7 @@
share/rmap/doc/README.midi
share/rmap/doc/TODO
share/rmap/doc/USA.rc
+share/rmap/doc/VECTORMAP
share/rmap/doc/WARNING
share/rmap/factbook/countrylisting.html
share/rmap/factbook/extra/Ashmore_and_Cartier_Islands
--- patch-xrmap ends here ---
--- patch-Imakefile begins here ---
--- Imakefile.orig Sat May 10 09:02:50 2003
+++ Imakefile Sat May 10 22:00:54 2003
@@ -1,14 +1,15 @@
XCOMM Should install to /usr or /usr/local ??
-DESTDIR=/usr
+DESTDIR=
+PREFIX=/usr/X11R6
XCOMM Name of man subdirectory of DESTDIR:
-MANDIR=/X11R6/man/man1
+MANDIR=$(PREFIX)/man/man1
XCOMM Name of bin subdirectory of DESTDIR: /X11R6/bin or maybe just /bin
-BINDIR=/X11R6/bin
+BINDIR=$(PREFIX)/bin
XCOMM Name of share subdirectory of DESTDIR:
-SHAREDIR=/share/rmap
+SHAREDIR=$(PREFIX)/share/rmap
XCOMM Default external utilities :
XCOMM PostScript viewer, image viewer, HTML viewer, Print command
@@ -33,18 +34,18 @@
XCOMM HP-UX
ZLIBDIR=
-CCOPTIONS = -Ae -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\"
+CCOPTIONS = -Ae -DZLIB -DSHAREDIR=\"$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\"
#else
XCOMM SunOS
ZLIBDIR=-L/usr/lib
-CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\"
+CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\"
XCOMM Solaris, Linux
ZLIBDIR=-L/usr/lib
-CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\"
+CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMIDIPLAYER=\"$(MIDIPLAYER)\"
#endif
@@ -62,28 +63,35 @@
ComplexProgramTarget(xrmap)
install.man::
- if [ -r $(DESTDIR)$(MANDIR)/xrmap.1x.gz ] ; \
- then gzip -f $(DESTDIR)$(MANDIR)/xrmap.1x ; fi
+ if [ -r $(MANDIR)/xrmap.1x.gz ] ; \
+ then gzip -f $(MANDIR)/xrmap.1x ; fi
all::
strip xrmap ; ls -al xrmap
cd editkit ; make emx
install:: install.man
- $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)
- cp -f Xrmaprc Locations $(DESTDIR)$(SHAREDIR)
+ $(MKDIRHIER) $(SHAREDIR)
+ cp -f Xrmaprc Locations CIA_WDB2.jpd $(SHAREDIR)
+ cp -f Xrmaprc Locations $(SHAREDIR)
cd postscript ; rm -f *~
- cp -fR postscript $(DESTDIR)$(SHAREDIR)
+ cp -fR postscript $(SHAREDIR)
cd themes ; rm -f *~
- cp -fR themes $(DESTDIR)$(SHAREDIR)
+ cp -fR themes $(SHAREDIR)
if [ -d i18n ] ; then cd i18n ; rm -f *~ ; fi
- if [ -d i18n ] ; then cp -fR i18n $(DESTDIR)$(SHAREDIR) ; fi
- $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/flags
- if [ -d picons ] ; then cp -fR picons $(DESTDIR)$(SHAREDIR) ; fi
- $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/doc
+ if [ -d i18n ] ; then cp -fR i18n $(SHAREDIR) ; fi
+ $(MKDIRHIER) $(SHAREDIR)/flags
+ if [ -d flags ] ; then cp -fR flags $(SHAREDIR); fi
+ if [ -d anthems ] ; then cp -fR anthems $(SHAREDIR); fi
+ if [ -d hymns ] ; then cp -fR hymns $(SHAREDIR); fi
+ if [ -d picons ] ; then cp -fR picons $(SHAREDIR) ; fi
+ if [ -d pdfmaps ] ; then cp -fR pdfmaps $(SHAREDIR) ; fi
+ if [ -d factbook ] ; then cp -fR factbook $(SHAREDIR) ; fi
+ if [ -d picons ] ; then cp -fR picons $(SHAREDIR) ; fi
+ $(MKDIRHIER) $(SHAREDIR)/doc
cp -f CHANGES INSTALL LICENSE MAPEDIT README TODO VECTORMAP WARNING \
- midi_cfg/README.midi $(DESTDIR)$(SHAREDIR)/doc
- cd examples ; cp -f * $(DESTDIR)$(SHAREDIR)/doc
+ midi_cfg/README.midi $(SHAREDIR)/doc
+ cd examples ; cp -f * $(SHAREDIR)/doc
cd editkit ; make install
cat WARNING
--- patch-Imakefile ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list