Update to 2.27

PR:		51627
Submitted by:	maintainer
This commit is contained in:
Tilman Keskinoz 2003-05-09 15:44:42 +00:00
parent b8908f06f8
commit dc1bcb71ad
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=80554
10 changed files with 72 additions and 54 deletions

View file

@ -6,7 +6,7 @@
#
PORTNAME= xrmap
PORTVERSION= 2.26
PORTVERSION= 2.27
CATEGORIES= misc
MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/ \
ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/ \
@ -26,7 +26,7 @@ USE_REINPLACE= yes
MAN1= xrmap.1
CIAFILE= CIA_WDB2.jpd.bz2
XRMAPFILE= xrmap-2.26.tar.bz2
XRMAPFILE= xrmap-2.27.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

View file

@ -1,4 +1,4 @@
MD5 (xrmap-2.26.tar.bz2) = 623393a75b7a9ded20834add3aa0e748
MD5 (xrmap-2.27.tar.bz2) = 11a47b0e2c8fdab904759a54684dcb50
MD5 (CIA_WDB2.jpd.bz2) = 8239b0d93bfec8d46d337dad9896774a
MD5 (anthems-1.1.tar.bz2) = 4d63e6a61e9197f3c382e518de6503db
MD5 (factbook_html_2002.tar.bz2) = 7909b52825123c677369eb723e5b267f

View file

@ -1,5 +1,5 @@
--- Imakefile.orig Wed Feb 12 10:25:02 2003
+++ Imakefile Mon Mar 17 23:18:07 2003
--- Imakefile.orig Wed Apr 30 09:09:43 2003
+++ Imakefile Wed Apr 30 09:20:21 2003
@@ -1,14 +1,15 @@
XCOMM Should install to /usr or /usr/local ??
-DESTDIR=/usr
@ -42,7 +42,7 @@
#endif
@@ -62,26 +63,30 @@
@@ -62,27 +63,32 @@
ComplexProgramTarget(xrmap)
install.man::
@ -62,6 +62,9 @@
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
@ -76,11 +79,11 @@
+ if [ -d pdfmaps ] ; then cp -fR pdfmaps $(SHAREDIR) ; fi
+ if [ -d factbook ] ; then cp -fR factbook $(SHAREDIR) ; fi
+ $(MKDIRHIER) $(SHAREDIR)/doc
cp -f CHANGES EXAMPLE.rc INSTALL LICENSE MAPEDIT README \
- midi_cfg/README.midi TODO WARNING $(DESTDIR)$(SHAREDIR)/doc
+ midi_cfg/README.midi TODO WARNING $(SHAREDIR)/doc
cp -f CHANGES INSTALL LICENSE MAPEDIT README TODO 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
cat WARNING
clean::
cd tools ; make clean

View file

@ -1,5 +1,5 @@
--- editkit/Makefile.orig Sun Dec 15 02:50:09 2002
+++ editkit/Makefile Mon Mar 17 17:01:38 2003
--- editkit/Makefile.orig Wed Apr 30 09:24:13 2003
+++ editkit/Makefile Wed Apr 30 09:26:32 2003
@@ -12,10 +12,11 @@
# TWOBUTN paste with button3 click, set selection with button3 drag
# MINIMAL to remove bak files, /usr/share/edmtx and e**rc
@ -10,17 +10,7 @@
-SHARE_DIR=/usr/share/editkit
-
-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DNOEDIT -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(SHARE_DIR)\""
+CFLAGS = -O2 $(INCLUDES) -fomit-frame-pointer -pipe -Wall -DTHREED -DNOEDIT -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(SHARE_DIR)\""
-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(SHARE_DIR)\""
+CFLAGS = -O2 $(INCLUDES) -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(SHARE_DIR)\""
#CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DMINIMAL -DTWOBUTN -DVERTCURS -DTLL
@@ -63,7 +64,7 @@
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 emx ]; then cp -f emx $(PREFIX)/bin; fi
mkdir -p $(SHARE_DIR)
cp -f rc.example $(SHARE_DIR)/rc.common
cp -f README $(SHARE_DIR)

View file

@ -201,7 +201,9 @@ share/rmap/anthems/yu.ant
share/rmap/anthems/za.ant
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/INSTALL
share/rmap/doc/LICENSE
@ -209,6 +211,7 @@ share/rmap/doc/MAPEDIT
share/rmap/doc/README
share/rmap/doc/README.midi
share/rmap/doc/TODO
share/rmap/doc/USA.rc
share/rmap/doc/WARNING
share/rmap/factbook/countrylisting.html
share/rmap/factbook/extra/Ashmore_and_Cartier_Islands
@ -2582,6 +2585,17 @@ share/rmap/picons/wheel.xpm
share/rmap/picons/win.xpm
share/rmap/postscript/macros.ps
share/rmap/postscript/private.ps
share/rmap/themes/buttons/b0.xpm.gz
share/rmap/themes/buttons/b1.xpm.gz
share/rmap/themes/buttons/b2.xpm.gz
share/rmap/themes/cloudy
share/rmap/themes/coffee
share/rmap/themes/default
share/rmap/themes/optional/clouds.xpm.gz
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
@ -2601,4 +2615,6 @@ share/rmap/postscript/private.ps
@dirrm share/rmap/pdfmaps
@dirrm share/rmap/picons
@dirrm share/rmap/postscript
@dirrm share/rmap
@dirrm share/rmap/themes/buttons
@dirrm share/rmap/themes/optional
@dirrm share/rmap/themes

View file

@ -6,7 +6,7 @@
#
PORTNAME= xrmap
PORTVERSION= 2.26
PORTVERSION= 2.27
CATEGORIES= misc
MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/ \
ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/ \
@ -26,7 +26,7 @@ USE_REINPLACE= yes
MAN1= xrmap.1
CIAFILE= CIA_WDB2.jpd.bz2
XRMAPFILE= xrmap-2.26.tar.bz2
XRMAPFILE= xrmap-2.27.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

View file

@ -1,4 +1,4 @@
MD5 (xrmap-2.26.tar.bz2) = 623393a75b7a9ded20834add3aa0e748
MD5 (xrmap-2.27.tar.bz2) = 11a47b0e2c8fdab904759a54684dcb50
MD5 (CIA_WDB2.jpd.bz2) = 8239b0d93bfec8d46d337dad9896774a
MD5 (anthems-1.1.tar.bz2) = 4d63e6a61e9197f3c382e518de6503db
MD5 (factbook_html_2002.tar.bz2) = 7909b52825123c677369eb723e5b267f

View file

@ -1,5 +1,5 @@
--- Imakefile.orig Wed Feb 12 10:25:02 2003
+++ Imakefile Mon Mar 17 23:18:07 2003
--- Imakefile.orig Wed Apr 30 09:09:43 2003
+++ Imakefile Wed Apr 30 09:20:21 2003
@@ -1,14 +1,15 @@
XCOMM Should install to /usr or /usr/local ??
-DESTDIR=/usr
@ -42,7 +42,7 @@
#endif
@@ -62,26 +63,30 @@
@@ -62,27 +63,32 @@
ComplexProgramTarget(xrmap)
install.man::
@ -62,6 +62,9 @@
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
@ -76,11 +79,11 @@
+ if [ -d pdfmaps ] ; then cp -fR pdfmaps $(SHAREDIR) ; fi
+ if [ -d factbook ] ; then cp -fR factbook $(SHAREDIR) ; fi
+ $(MKDIRHIER) $(SHAREDIR)/doc
cp -f CHANGES EXAMPLE.rc INSTALL LICENSE MAPEDIT README \
- midi_cfg/README.midi TODO WARNING $(DESTDIR)$(SHAREDIR)/doc
+ midi_cfg/README.midi TODO WARNING $(SHAREDIR)/doc
cp -f CHANGES INSTALL LICENSE MAPEDIT README TODO 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
cat WARNING
clean::
cd tools ; make clean

View file

@ -1,5 +1,5 @@
--- editkit/Makefile.orig Sun Dec 15 02:50:09 2002
+++ editkit/Makefile Mon Mar 17 17:01:38 2003
--- editkit/Makefile.orig Wed Apr 30 09:24:13 2003
+++ editkit/Makefile Wed Apr 30 09:26:32 2003
@@ -12,10 +12,11 @@
# TWOBUTN paste with button3 click, set selection with button3 drag
# MINIMAL to remove bak files, /usr/share/edmtx and e**rc
@ -10,17 +10,7 @@
-SHARE_DIR=/usr/share/editkit
-
-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DNOEDIT -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(SHARE_DIR)\""
+CFLAGS = -O2 $(INCLUDES) -fomit-frame-pointer -pipe -Wall -DTHREED -DNOEDIT -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(SHARE_DIR)\""
-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(SHARE_DIR)\""
+CFLAGS = -O2 $(INCLUDES) -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(SHARE_DIR)\""
#CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DMINIMAL -DTWOBUTN -DVERTCURS -DTLL
@@ -63,7 +64,7 @@
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 emx ]; then cp -f emx $(PREFIX)/bin; fi
mkdir -p $(SHARE_DIR)
cp -f rc.example $(SHARE_DIR)/rc.common
cp -f README $(SHARE_DIR)

View file

@ -201,7 +201,9 @@ share/rmap/anthems/yu.ant
share/rmap/anthems/za.ant
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/INSTALL
share/rmap/doc/LICENSE
@ -209,6 +211,7 @@ share/rmap/doc/MAPEDIT
share/rmap/doc/README
share/rmap/doc/README.midi
share/rmap/doc/TODO
share/rmap/doc/USA.rc
share/rmap/doc/WARNING
share/rmap/factbook/countrylisting.html
share/rmap/factbook/extra/Ashmore_and_Cartier_Islands
@ -2582,6 +2585,17 @@ share/rmap/picons/wheel.xpm
share/rmap/picons/win.xpm
share/rmap/postscript/macros.ps
share/rmap/postscript/private.ps
share/rmap/themes/buttons/b0.xpm.gz
share/rmap/themes/buttons/b1.xpm.gz
share/rmap/themes/buttons/b2.xpm.gz
share/rmap/themes/cloudy
share/rmap/themes/coffee
share/rmap/themes/default
share/rmap/themes/optional/clouds.xpm.gz
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
@ -2601,4 +2615,6 @@ share/rmap/postscript/private.ps
@dirrm share/rmap/pdfmaps
@dirrm share/rmap/picons
@dirrm share/rmap/postscript
@dirrm share/rmap
@dirrm share/rmap/themes/buttons
@dirrm share/rmap/themes/optional
@dirrm share/rmap/themes