aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--astro/xrmap/Makefile14
-rw-r--r--astro/xrmap/distinfo4
-rw-r--r--astro/xrmap/files/patch-Imakefile24
-rw-r--r--astro/xrmap/pkg-plist46
-rw-r--r--misc/xrmap/Makefile14
-rw-r--r--misc/xrmap/distinfo4
-rw-r--r--misc/xrmap/files/patch-Imakefile24
-rw-r--r--misc/xrmap/pkg-plist46
8 files changed, 90 insertions, 86 deletions
diff --git a/astro/xrmap/Makefile b/astro/xrmap/Makefile
index f766d63da6e2..8a7aec5e1d9d 100644
--- a/astro/xrmap/Makefile
+++ b/astro/xrmap/Makefile
@@ -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 @@ USE_REINPLACE= yes
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 @@ post-extract:
${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 --git a/astro/xrmap/distinfo b/astro/xrmap/distinfo
index 9b3a5fa1f992..fbfb36339766 100644
--- a/astro/xrmap/distinfo
+++ b/astro/xrmap/distinfo
@@ -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
diff --git a/astro/xrmap/files/patch-Imakefile b/astro/xrmap/files/patch-Imakefile
index ebdec5b66d46..ac6d441013ea 100644
--- a/astro/xrmap/files/patch-Imakefile
+++ b/astro/xrmap/files/patch-Imakefile
@@ -1,5 +1,5 @@
---- Imakefile.orig Wed Apr 30 09:09:43 2003
-+++ Imakefile Wed Apr 30 09:20:21 2003
+--- 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
@@ -24,25 +24,25 @@
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)\" -DMUSICPLAYER=\"$(MUSICPLAYER)\"
-+CCOPTIONS = -Ae -DZLIB -DSHAREDIR=\"$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMUSICPLAYER=\"$(MUSICPLAYER)\"
+-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)\" -DMUSICPLAYER=\"$(MUSICPLAYER)\"
-+CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMUSICPLAYER=\"$(MUSICPLAYER)\"
+-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)\" -DMUSICPLAYER=\"$(MUSICPLAYER)\"
-+CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMUSICPLAYER=\"$(MUSICPLAYER)\"
+-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,27 +63,32 @@
+@@ -62,28 +63,35 @@
ComplexProgramTarget(xrmap)
install.man::
@@ -52,6 +52,7 @@
+ then gzip -f $(MANDIR)/xrmap.1x ; fi
all::
+ strip xrmap ; ls -al xrmap
cd editkit ; make emx
install:: install.man
@@ -59,6 +60,7 @@
- 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)
@@ -78,12 +80,12 @@
+ 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 WARNING \
+ 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
-
diff --git a/astro/xrmap/pkg-plist b/astro/xrmap/pkg-plist
index aded8d0f9e5b..89518b225d8c 100644
--- a/astro/xrmap/pkg-plist
+++ b/astro/xrmap/pkg-plist
@@ -1,9 +1,9 @@
bin/emx
bin/xrmap
-share/editkit/rc.common
+share/editkit/MANUAL.emacs
share/editkit/README
share/editkit/emxrc
-share/editkit/MANUAL.emacs
+share/editkit/rc.common
share/rmap/CIA_WDB2.jpd
share/rmap/Locations
share/rmap/Xrmaprc
@@ -203,8 +203,8 @@ share/rmap/anthems/zm.ant
share/rmap/anthems/zw.ant
share/rmap/doc/Asia.rc
share/rmap/doc/CHANGES
-share/rmap/doc/Europe.rc
share/rmap/doc/EXAMPLE.rc
+share/rmap/doc/Europe.rc
share/rmap/doc/INSTALL
share/rmap/doc/LICENSE
share/rmap/doc/MAPEDIT
@@ -212,6 +212,7 @@ share/rmap/doc/README
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
@@ -2596,25 +2597,26 @@ share/rmap/themes/optional/coffee.xpm.gz
share/rmap/themes/optional/landscape.xpm.gz
share/rmap/themes/optional/sea.xpm.gz
share/rmap/themes/sea
-@dirrm share/editkit
-@dirrm share/rmap/anthems
-@dirrm share/rmap/doc
-@dirrm share/rmap/factbook/extra
-@dirrm share/rmap/factbook/flags
-@dirrm share/rmap/factbook/geos
+@dirrm share/rmap/themes/optional
+@dirrm share/rmap/themes/buttons
+@dirrm share/rmap/themes
+@dirrm share/rmap/postscript
+@dirrm share/rmap/picons
+@dirrm share/rmap/pdfmaps
+@dirrm share/rmap/i18n
+@dirrm share/rmap/hymns
+@dirrm share/rmap/flags/small
+@dirrm share/rmap/flags/big
+@dirrm share/rmap/flags
+@dirrm share/rmap/factbook/text
+@dirrm share/rmap/factbook/maps
@dirrm share/rmap/factbook/graphics/flaginterface
@dirrm share/rmap/factbook/graphics
-@dirrm share/rmap/factbook/maps
-@dirrm share/rmap/factbook/text
+@dirrm share/rmap/factbook/geos
+@dirrm share/rmap/factbook/flags
+@dirrm share/rmap/factbook/extra
@dirrm share/rmap/factbook
-@dirrm share/rmap/flags/big
-@dirrm share/rmap/flags/small
-@dirrm share/rmap/flags
-@dirrm share/rmap/hymns
-@dirrm share/rmap/i18n
-@dirrm share/rmap/pdfmaps
-@dirrm share/rmap/picons
-@dirrm share/rmap/postscript
-@dirrm share/rmap/themes/buttons
-@dirrm share/rmap/themes/optional
-@dirrm share/rmap/themes
+@dirrm share/rmap/doc
+@dirrm share/rmap/anthems
+@dirrm share/rmap
+@dirrm share/editkit
diff --git a/misc/xrmap/Makefile b/misc/xrmap/Makefile
index f766d63da6e2..8a7aec5e1d9d 100644
--- a/misc/xrmap/Makefile
+++ b/misc/xrmap/Makefile
@@ -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 @@ USE_REINPLACE= yes
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 @@ post-extract:
${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 --git a/misc/xrmap/distinfo b/misc/xrmap/distinfo
index 9b3a5fa1f992..fbfb36339766 100644
--- a/misc/xrmap/distinfo
+++ b/misc/xrmap/distinfo
@@ -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
diff --git a/misc/xrmap/files/patch-Imakefile b/misc/xrmap/files/patch-Imakefile
index ebdec5b66d46..ac6d441013ea 100644
--- a/misc/xrmap/files/patch-Imakefile
+++ b/misc/xrmap/files/patch-Imakefile
@@ -1,5 +1,5 @@
---- Imakefile.orig Wed Apr 30 09:09:43 2003
-+++ Imakefile Wed Apr 30 09:20:21 2003
+--- 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
@@ -24,25 +24,25 @@
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)\" -DMUSICPLAYER=\"$(MUSICPLAYER)\"
-+CCOPTIONS = -Ae -DZLIB -DSHAREDIR=\"$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMUSICPLAYER=\"$(MUSICPLAYER)\"
+-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)\" -DMUSICPLAYER=\"$(MUSICPLAYER)\"
-+CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMUSICPLAYER=\"$(MUSICPLAYER)\"
+-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)\" -DMUSICPLAYER=\"$(MUSICPLAYER)\"
-+CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(SHAREDIR)\" -DPS_VIEWER=\"$(PS_VIEWER)\" -DIM_VIEWER=\"$(IM_VIEWER)\" -DHTML_VIEWER=\"$(HTML_VIEWER)\" -DPRINT_CMD=\"$(PRINT_CMD)\" -DEDITOR=\"$(EDITOR)\" -DMUSICPLAYER=\"$(MUSICPLAYER)\"
+-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,27 +63,32 @@
+@@ -62,28 +63,35 @@
ComplexProgramTarget(xrmap)
install.man::
@@ -52,6 +52,7 @@
+ then gzip -f $(MANDIR)/xrmap.1x ; fi
all::
+ strip xrmap ; ls -al xrmap
cd editkit ; make emx
install:: install.man
@@ -59,6 +60,7 @@
- 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)
@@ -78,12 +80,12 @@
+ 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 WARNING \
+ 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
-
diff --git a/misc/xrmap/pkg-plist b/misc/xrmap/pkg-plist
index aded8d0f9e5b..89518b225d8c 100644
--- a/misc/xrmap/pkg-plist
+++ b/misc/xrmap/pkg-plist
@@ -1,9 +1,9 @@
bin/emx
bin/xrmap
-share/editkit/rc.common
+share/editkit/MANUAL.emacs
share/editkit/README
share/editkit/emxrc
-share/editkit/MANUAL.emacs
+share/editkit/rc.common
share/rmap/CIA_WDB2.jpd
share/rmap/Locations
share/rmap/Xrmaprc
@@ -203,8 +203,8 @@ share/rmap/anthems/zm.ant
share/rmap/anthems/zw.ant
share/rmap/doc/Asia.rc
share/rmap/doc/CHANGES
-share/rmap/doc/Europe.rc
share/rmap/doc/EXAMPLE.rc
+share/rmap/doc/Europe.rc
share/rmap/doc/INSTALL
share/rmap/doc/LICENSE
share/rmap/doc/MAPEDIT
@@ -212,6 +212,7 @@ share/rmap/doc/README
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
@@ -2596,25 +2597,26 @@ share/rmap/themes/optional/coffee.xpm.gz
share/rmap/themes/optional/landscape.xpm.gz
share/rmap/themes/optional/sea.xpm.gz
share/rmap/themes/sea
-@dirrm share/editkit
-@dirrm share/rmap/anthems
-@dirrm share/rmap/doc
-@dirrm share/rmap/factbook/extra
-@dirrm share/rmap/factbook/flags
-@dirrm share/rmap/factbook/geos
+@dirrm share/rmap/themes/optional
+@dirrm share/rmap/themes/buttons
+@dirrm share/rmap/themes
+@dirrm share/rmap/postscript
+@dirrm share/rmap/picons
+@dirrm share/rmap/pdfmaps
+@dirrm share/rmap/i18n
+@dirrm share/rmap/hymns
+@dirrm share/rmap/flags/small
+@dirrm share/rmap/flags/big
+@dirrm share/rmap/flags
+@dirrm share/rmap/factbook/text
+@dirrm share/rmap/factbook/maps
@dirrm share/rmap/factbook/graphics/flaginterface
@dirrm share/rmap/factbook/graphics
-@dirrm share/rmap/factbook/maps
-@dirrm share/rmap/factbook/text
+@dirrm share/rmap/factbook/geos
+@dirrm share/rmap/factbook/flags
+@dirrm share/rmap/factbook/extra
@dirrm share/rmap/factbook
-@dirrm share/rmap/flags/big
-@dirrm share/rmap/flags/small
-@dirrm share/rmap/flags
-@dirrm share/rmap/hymns
-@dirrm share/rmap/i18n
-@dirrm share/rmap/pdfmaps
-@dirrm share/rmap/picons
-@dirrm share/rmap/postscript
-@dirrm share/rmap/themes/buttons
-@dirrm share/rmap/themes/optional
-@dirrm share/rmap/themes
+@dirrm share/rmap/doc
+@dirrm share/rmap/anthems
+@dirrm share/rmap
+@dirrm share/editkit
generated by cgit (git 2.34.1) at 2024-11-24 04:47:43 +0800